From b5417b3e7720b5a59eea23fa27521d257348ea6f Mon Sep 17 00:00:00 2001
From: "Kovacsics Robert (NixOS)" <kovirobi@gmail.com>
Date: Tue, 18 Oct 2016 16:28:38 +0100
Subject: [PATCH 01/87] remind: fix tkremind

---
 pkgs/tools/misc/remind/default.nix | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix
index 11d6991b89c..dfda07fda4e 100644
--- a/pkgs/tools/misc/remind/default.nix
+++ b/pkgs/tools/misc/remind/default.nix
@@ -1,12 +1,33 @@
-{stdenv, fetchurl} :
+{stdenv, fetchurl, tk, tcllib, makeWrapper
+, tkremind ? true
+} :
 
-stdenv.mkDerivation {
+assert tkremind -> tk != null;
+assert tkremind -> tcllib != null;
+assert tkremind -> makeWrapper != null;
+
+stdenv.mkDerivation rec {
   name = "remind-3.1.15";
   src = fetchurl {
     url = http://www.roaringpenguin.com/files/download/remind-03.01.15.tar.gz;
     sha256 = "1hcfcxz5fjzl7606prlb7dgls5kr8z3wb51h48s6qm8ang0b9nla";
   };
 
+  tclLibraries = if tkremind then [ tcllib tk ] else [];
+  tclLibPaths = stdenv.lib.concatStringsSep " "
+    (map (p: "${p}/lib/${p.libPrefix}") tclLibraries);
+
+  buildInputs = if tkremind then [ makeWrapper ] else [];
+  propagatedBuildInputs = tclLibraries;
+
+  postPatch = if tkremind then ''
+    substituteInPlace scripts/tkremind --replace "exec wish" "exec ${tk}/bin/wish"
+  '' else "";
+
+  postInstall = if tkremind then ''
+    wrapProgram $out/bin/tkremind --set TCLLIBPATH "${tclLibPaths}"
+  '' else "";
+
   meta = {
     homepage = http://www.roaringpenguin.com/products/remind;
     description = "Sophisticated calendar and alarm program for the console";

From b85d9003f2dfa32a2a252845a6f304a1cba63c2f Mon Sep 17 00:00:00 2001
From: "A.J.Rouvoet" <arjen.rouvoet@stcorp.nl>
Date: Tue, 25 Oct 2016 15:25:56 +0200
Subject: [PATCH 02/87] libspatialite: link missing mod_spatialite.dylib

fix #19856
---
 pkgs/development/libraries/libspatialite/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/development/libraries/libspatialite/default.nix
index faa0b988be2..d5e72cae5fc 100644
--- a/pkgs/development/libraries/libspatialite/default.nix
+++ b/pkgs/development/libraries/libspatialite/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, sqlite, zlib, proj, geos, libiconv }:
+{ stdenv, lib, fetchurl, pkgconfig, libxml2, sqlite, zlib, proj, geos, libiconv }:
+
+with lib;
 
 stdenv.mkDerivation rec {
   name = "libspatialite-4.2.0";
@@ -14,7 +16,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  postInstall = "" + optionalString stdenv.isDarwin ''
+    ln -s $out/lib/mod_spatialite.{so,dylib}
+  '';
+
+  meta = {
     description = "Extensible spatial index library in C++";
     homepage = https://www.gaia-gis.it/fossil/libspatialite;
     # They allow any of these

From 95b95ffc853e343d97f4569b5c4ac0a13cedc0c4 Mon Sep 17 00:00:00 2001
From: Pierre Radermecker <pierrer@pi3r.be>
Date: Tue, 25 Oct 2016 22:51:06 +0200
Subject: [PATCH 03/87] hackage2nix: add hruby x86_64-linux to hydra

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

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 3d526621c51..82a2ddc57fa 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -4518,7 +4518,7 @@ dont-distribute-packages:
   HROOT-io:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HROOT-math:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   HROOT:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hruby:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hruby:                                        [ i686-linux, x86_64-darwin ]
   hs-blake2:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-carbon-examples:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-cdb:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]

From c86fe2224e09b2ebb30c98de0b17b72147d7d226 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 24 Oct 2016 12:43:42 +0200
Subject: [PATCH 04/87] virtualbox-{systemd-detect-virt,net-hostonlyif} test:
 fix dbus socket dir

The test complains[1][2] that

   Failed to start message bus: Failed to bind socket "/run/dbus/system_bus_socket": No such file or directory

In 639e5401ff51d4c0075b5ceffcbdbfec64c67db3, the dbus socket dir is set
to `/run/dbus`; in the test vm `/var/run/dbus` is used, but the standard
`/run -> /var/run` link is typically not created until stage 2 init, not
in the minimal init used here.  Thus, dbus fails to run within the test
environment .  Fix by changing `/var/run/dbus` to simply `/run/dbus`.

[1]: https://hydra.nixos.org/build/42534725
[2]: https://hydra.nixos.org/build/42523834
---
 nixos/tests/virtualbox.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix
index 66f16ed8bcc..02a8fc68028 100644
--- a/nixos/tests/virtualbox.nix
+++ b/nixos/tests/virtualbox.nix
@@ -11,10 +11,10 @@ let
       #!${pkgs.stdenv.shell} -xe
       export PATH="${lib.makeBinPath [ pkgs.coreutils pkgs.utillinux ]}"
 
-      mkdir -p /var/run/dbus
+      mkdir -p /run/dbus
       cat > /etc/passwd <<EOF
       root:x:0:0::/root:/bin/false
-      messagebus:x:1:1::/var/run/dbus:/bin/false
+      messagebus:x:1:1::/run/dbus:/bin/false
       EOF
       cat > /etc/group <<EOF
       root:x:0:

From 37afc5cda13abfbc2dd838e8a242efca1e4cd68a Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 24 Oct 2016 17:53:20 +0200
Subject: [PATCH 05/87] opensmtpd service: serviceConfiguration option as
 types.lines

---
 nixos/modules/services/mail/opensmtpd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix
index fb94560e10a..2de7ef48ad1 100644
--- a/nixos/modules/services/mail/opensmtpd.nix
+++ b/nixos/modules/services/mail/opensmtpd.nix
@@ -48,12 +48,12 @@ in {
       };
 
       serverConfiguration = mkOption {
-        type = types.string;
+        type = types.lines;
         default = "";
         example = ''
           listen on lo
           accept for any deliver to lmtp localhost:24
-        ''; 
+        '';
         description = ''
           The contents of the smtpd.conf configuration file. See the
           OpenSMTPD documentation for syntax information. If this option

From 946fe73b56779210419bb93f4fcf700b1ec67a21 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 24 Oct 2016 17:53:50 +0200
Subject: [PATCH 06/87] opensmtpd service: use explicit pkgs for consistency

---
 nixos/modules/services/mail/opensmtpd.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix
index 2de7ef48ad1..c54fd1950cf 100644
--- a/nixos/modules/services/mail/opensmtpd.nix
+++ b/nixos/modules/services/mail/opensmtpd.nix
@@ -1,17 +1,16 @@
 { config, lib, pkgs, ... }:
 
-with pkgs;
 with lib;
 
 let
 
   cfg = config.services.opensmtpd;
-  conf = writeText "smtpd.conf" cfg.serverConfiguration;
+  conf = pkgs.writeText "smtpd.conf" cfg.serverConfiguration;
   args = concatStringsSep " " cfg.extraServerArgs;
 
   sendmail = pkgs.runCommand "opensmtpd-sendmail" {} ''
     mkdir -p $out/bin
-    ln -s ${opensmtpd}/sbin/smtpctl $out/bin/sendmail
+    ln -s ${pkgs.opensmtpd}/sbin/smtpctl $out/bin/sendmail
   '';
 
 in {
@@ -100,7 +99,7 @@ in {
     systemd.services.opensmtpd = let
       procEnv = pkgs.buildEnv {
         name = "opensmtpd-procs";
-        paths = [ opensmtpd ] ++ cfg.procPackages;
+        paths = [ pkgs.opensmtpd ] ++ cfg.procPackages;
         pathsToLink = [ "/libexec/opensmtpd" ];
       };
     in {

From 3851afc8eb5f3c5d691ec73a370ee26fd0bd385e Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 24 Oct 2016 17:54:10 +0200
Subject: [PATCH 07/87] opensmtpd service: path -> package for option
 procPackages

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

diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix
index c54fd1950cf..3b493d2015d 100644
--- a/nixos/modules/services/mail/opensmtpd.nix
+++ b/nixos/modules/services/mail/opensmtpd.nix
@@ -61,7 +61,7 @@ in {
       };
 
       procPackages = mkOption {
-        type = types.listOf types.path;
+        type = types.listOf types.package;
         default = [];
         description = ''
           Packages to search for filters, tables, queues, and schedulers.

From f24ffc4919ed2cab8e49a85ff038a09c069aa2ca Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 24 Oct 2016 17:56:30 +0200
Subject: [PATCH 08/87] opensmtpd service: require serverConfiguration

If the daemon won't function without a valid config, it makes no sense
to default to an empty config.  Instead, turn that case into a build
failure.
---
 nixos/modules/services/mail/opensmtpd.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix
index 3b493d2015d..f048a382ca4 100644
--- a/nixos/modules/services/mail/opensmtpd.nix
+++ b/nixos/modules/services/mail/opensmtpd.nix
@@ -48,15 +48,13 @@ in {
 
       serverConfiguration = mkOption {
         type = types.lines;
-        default = "";
         example = ''
           listen on lo
           accept for any deliver to lmtp localhost:24
         '';
         description = ''
           The contents of the smtpd.conf configuration file. See the
-          OpenSMTPD documentation for syntax information. If this option
-          is left empty, the OpenSMTPD server will not start.
+          OpenSMTPD documentation for syntax information.
         '';
       };
 

From ab1e216942a227d00ac8aaad84df6483335b14d1 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 24 Oct 2016 18:02:18 +0200
Subject: [PATCH 09/87] opensmtpd service: remove redundant wants
 network.target

Already part of normal bootup.
---
 nixos/modules/services/mail/opensmtpd.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix
index f048a382ca4..5856b469755 100644
--- a/nixos/modules/services/mail/opensmtpd.nix
+++ b/nixos/modules/services/mail/opensmtpd.nix
@@ -102,7 +102,6 @@ in {
       };
     in {
       wantedBy = [ "multi-user.target" ];
-      wants = [ "network.target" ];
       after = [ "network.target" ];
       preStart = ''
         mkdir -p /var/spool/smtpd

From 070ff88fea1ccbd7a6201afb98923b7d90442f2b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 25 Oct 2016 21:42:42 -0400
Subject: [PATCH 10/87] openjdk: 8u122-03 -> 8u122-04

---
 pkgs/development/compilers/openjdk/8.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index 78cf644e5c9..d0933b9a195 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -22,41 +22,41 @@ let
       throw "openjdk requires i686-linux or x86_64 linux";
 
   update = "122";
-  build = "03";
+  build = "04";
   baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u";
   repover = "jdk8u${update}-b${build}";
   paxflags = if stdenv.isi686 then "msp" else "m";
   jdk8 = fetchurl {
              url = "${baseurl}/archive/${repover}.tar.gz";
-             sha256 = "0s3igii73s9jpq8prpvfhymiadr7vi15cllkxjrks7khx0brcs6m";
+             sha256 = "1zqqy5gzrx7f438j5pjdavj41plb04p6b1ikspksrgnhs5wrrr02";
           };
   langtools = fetchurl {
              url = "${baseurl}/langtools/archive/${repover}.tar.gz";
-             sha256 = "1x9g3z10mskcv08sdgd1vcm1mf4668ww2s4ivx9spf2vdalk9a4x";
+             sha256 = "0hhsm23mxvjxmf0jxlhm57s203k88s8xbmk71l8zlnjsz88ni4gx";
           };
   hotspot = fetchurl {
              url = "${baseurl}/hotspot/archive/${repover}.tar.gz";
-             sha256 = "1zz0k4grqw57mgcrximq7g7h3c149s1x9b6xcwvvl2f6qn791pn9";
+             sha256 = "1r4a52brsg1xd2dc2b8lzd4w4yvcjdmj9a6avjihx1hpgcs4xzd1";
           };
   corba = fetchurl {
              url = "${baseurl}/corba/archive/${repover}.tar.gz";
-             sha256 = "1xi2yi6wplzfnx213w8zpc78rbclig13m7zl2mgz61ay2l2v8znh";
+             sha256 = "0ixa6kdqkiq83817qdymiy772449iva11rh3pr68qpfnmbx1zzil";
           };
   jdk = fetchurl {
              url = "${baseurl}/jdk/archive/${repover}.tar.gz";
-             sha256 = "01r9cwm68dc34qigl3jn0bifmbgf8jgmddr0wi54sn126pn48c2j";
+             sha256 = "1kw4h3j93cvnlzh0vhj4xxdm90bk7hfg6kpqk09x0a12whh2ww3h";
           };
   jaxws = fetchurl {
              url = "${baseurl}/jaxws/archive/${repover}.tar.gz";
-             sha256 = "043zwvnq9zjnb06xfcbi3rd15ji80z79cdar7hdx0d8ifgd75wsb";
+             sha256 = "0wrj3jyv3922m3pxfg0i9c3ap71b0rass7swvhi996c029rd12r7";
           };
   jaxp = fetchurl {
              url = "${baseurl}/jaxp/archive/${repover}.tar.gz";
-             sha256 = "1ydbwpa4v28npdgla7aiwsfk3k4ylj86vz482zq3j7h30i6w9h4v";
+             sha256 = "0b743mygzdavdd59l98b3l6a03dihs4ipd1xlpkacy778wzpr59d";
           };
   nashorn = fetchurl {
              url = "${baseurl}/nashorn/archive/${repover}.tar.gz";
-             sha256 = "01bpbfwh1ilqn5ls7krmkklsmvl2zhzkqwag49jypiqa0w3vvaih";
+             sha256 = "10wkshhzj15wvx7i53dbkwi85f4fbbxi26zphr5b6daf3ib0hind";
           };
   openjdk8 = stdenv.mkDerivation {
     name = "openjdk-8u${update}b${build}";

From 0a4374f79c2cee2115624533b9b9c4fa1bdd6cb3 Mon Sep 17 00:00:00 2001
From: Travis Whitaker <pi.boy.travis@gmail.com>
Date: Tue, 25 Oct 2016 20:24:26 -0700
Subject: [PATCH 11/87] lmdb: 0.9.16 -> 0.9.18

---
 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 8621a573190..80019d52f4f 100644
--- a/pkgs/development/libraries/lmdb/default.nix
+++ b/pkgs/development/libraries/lmdb/default.nix
@@ -3,11 +3,11 @@
 let optional = stdenv.lib.optional;
 in stdenv.mkDerivation rec {
   name = "lmdb-${version}";
-  version = "0.9.16";
+  version = "0.9.18";
 
   src = fetchzip {
     url = "https://github.com/LMDB/lmdb/archive/LMDB_${version}.tar.gz";
-    sha256 = "1lkmngscijwiz09gdkqygdp87x55vp8gb4fh4vq7s34k4jv0327l";
+    sha256 = "01j384kxg36kym060pybr5p6mjw0xv33bqbb8arncdkdq57xk8wg";
   };
 
   postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb";

From d9c7a14c6ac80f64b5ac002b8582c7f5e4199a5f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 26 Oct 2016 10:29:04 +0200
Subject: [PATCH 12/87] hplip: use mkPythonDerivation

since hplip is a Python package that doesn't use setuptools. Note that a
setup.py is provided, however, using buildPythonPackage fails.
---
 pkgs/misc/drivers/hplip/default.nix | 38 +++--------------------------
 1 file changed, 4 insertions(+), 34 deletions(-)

diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index bf0af6b806f..c0a6c0a9baa 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -3,7 +3,7 @@
 , cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils
 , net_snmp, openssl, polkit
 , bash, coreutils, utillinux
-, qtSupport ? true, qt4
+, qtSupport ? true
 , withPlugin ? false
 }:
 
@@ -47,32 +47,27 @@ in
 assert withPlugin -> builtins.elem hplipArch pluginArches
   || throw "HPLIP plugin not supported on ${stdenv.system}";
 
-stdenv.mkDerivation {
+pythonPackages.mkPythonDerivation {
   inherit name src;
 
   buildInputs = [
     libjpeg
     cups
     libusb1
-    pythonPackages.python
-    pythonPackages.wrapPython
     sane-backends
     dbus
     net_snmp
     openssl
-  ] ++ stdenv.lib.optionals qtSupport [
-    qt4
   ];
 
   nativeBuildInputs = [
     pkgconfig
   ];
 
-  pythonPath = with pythonPackages; [
+  propagatedBuildInputs = with pythonPackages; [
     dbus
     pillow
     pygobject2
-    recursivePthLoader
     reportlab
     usbutils
   ] ++ stdenv.lib.optionals qtSupport [
@@ -149,32 +144,7 @@ stdenv.mkDerivation {
     rm $out/etc/udev/rules.d/56-hpmud.rules
   '';
 
-  fixupPhase = ''
-    # 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
-      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
-
-    # 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"
-
+  postFixup = ''
     substituteInPlace $out/etc/hp/hplip.conf --replace /usr $out
   '' + stdenv.lib.optionalString (!withPlugin) ''
     # A udev rule to notify users that they need the binary plugin.

From e5ad26e48e7f74435219adf85be97f014a567eda Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 26 Oct 2016 07:30:34 -0400
Subject: [PATCH 13/87] libdwarf: 20161001 -> 20161021 for CVE-2016-8679

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

diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix
index 9989990e35d..a064769ec84 100644
--- a/pkgs/development/libraries/libdwarf/default.nix
+++ b/pkgs/development/libraries/libdwarf/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libelf }:
 
 stdenv.mkDerivation rec {
-  name = "libdwarf-20161001";
+  name = "libdwarf-20161021";
 
   src = fetchurl {
     url = "http://www.prevanders.net/${name}.tar.gz";
-    sha512 = "2c522ae0b6e2afffd09e2e79562987fd819b197c9bce4900b6a4fd176b5ff229e88c6b755cfbae7831e7160ddeb3bfe2afbf39d756d7e75ec31ace0668554048";
+    sha512 = "733523fd5c58f878d65949c1812b2f46b40c4cc3177bc780c703ec71f83675d4b84e81bc1bcca42adf69b5e122562e4ce8e9a8743af29cc6fafe78ed9f8213fd";
   };
 
   configureFlags = " --enable-shared --disable-nonshared";

From d19b53f8516ca6a52918f5db216bd59a3b69a1aa Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 26 Oct 2016 21:13:57 +0900
Subject: [PATCH 14/87] flashplayer: 11.2.202.637 -> 11.2.202.643

---
 .../browsers/mozilla-plugins/flashplayer-11/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 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 81fca6614a5..4d598bbb3a9 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
@@ -70,11 +70,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "flashplayer-${version}";
-  version = "11.2.202.637";
+  version = "11.2.202.643";
 
   src = fetchurl {
     url = "https://fpdownload.macromedia.com/pub/flashplayer/installers/archive/fp_${version}_archive.zip";
-    sha256 = "0xp1pxhrnam4yi8wfwaifqx7m2im0zx2xv8xgbdm0llrzbkc57mh";
+    sha256 = "02imhdzhali42m8d1rw3bqscvi70707mssss7c43dm2kf67z6y8s";
   };
 
   nativeBuildInputs = [ unzip ];

From e9a5cf3f6f532551e9841bcb7c6364ee161be2c8 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 26 Oct 2016 09:11:00 -0400
Subject: [PATCH 15/87] kernel: 4.9-rc1 -> 4.9-rc2

---
 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 1a411a258dd..38be5ec588d 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, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9-rc1";
-  modDirVersion = "4.9.0-rc1";
+  version = "4.9-rc2";
+  modDirVersion = "4.9.0-rc2";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
-    sha256 = "1s123bs20zp1zzy0i12y63n6wsr9cwaad4110rl5ir49j6z6byqf";
+    sha256 = "1hf913mgyz5niy971c505s8yhqrdvq65psdrjz7cxmdxsb96pk94";
   };
 
   features.iwlwifi = true;

From 96a3e0092985a39ef52235c69d7b15a1004a5d15 Mon Sep 17 00:00:00 2001
From: Carl Sverre <accounts@carlsverre.com>
Date: Wed, 26 Oct 2016 10:28:09 -0700
Subject: [PATCH 16/87] sysdig: 0.10.0 -> 0.12.0

---
 pkgs/os-specific/linux/sysdig/default.nix | 37 ++++++++++++-----------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index 76858ab5e48..1088e0befdf 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -1,26 +1,19 @@
-{stdenv, fetchurl, fetchFromGitHub, cmake, luajit, kernel, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl}:
+{stdenv, fetchurl, fetchFromGitHub, cmake, luajit, kernel, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc}:
 let
   inherit (stdenv.lib) optional optionalString;
   baseName = "sysdig";
-  version = "0.10.0";
-  # sysdig-0.11.0 depends on some headers from jq which are not
-  # installed by default.
-  # Relevant sysdig issue: https://github.com/draios/sysdig/issues/626
-  jq-prefix = fetchurl {
-    url="https://github.com/stedolan/jq/releases/download/jq-1.5/jq-1.5.tar.gz";
-    sha256="0g29kyz4ykasdcrb0zmbrp2jqs9kv1wz9swx849i2d1ncknbzln4";
-  };
+  version = "0.12.0";
 in
 stdenv.mkDerivation {
   name = "${baseName}-${version}";
 
   src = fetchurl {
     url = "https://github.com/draios/sysdig/archive/${version}.tar.gz";
-    sha256 = "0hs0r9z9j7padqdcj69bwx52iw6gvdl0w322qwivpv12j3prcpsj";
+    sha256 = "17nf2h5ajy333rwh91hzaw8zq2mnkb3lxy8fmbbs8qazgsvwz6c3";
   };
 
   buildInputs = [
-    cmake zlib luajit ncurses perl jsoncpp libb64 openssl curl
+    cmake zlib luajit ncurses perl jsoncpp libb64 openssl curl jq gcc
   ];
 
   hardeningDisable = [ "pic" ];
@@ -31,7 +24,6 @@ stdenv.mkDerivation {
 
   cmakeFlags = [
     "-DUSE_BUNDLED_DEPS=OFF"
-    "-DUSE_BUNDLED_JQ=ON"
     "-DSYSDIG_VERSION=${version}"
   ] ++ optional (kernel == null) "-DBUILD_DRIVER=OFF";
 
@@ -41,12 +33,23 @@ stdenv.mkDerivation {
     export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
   '';
 
-  preBuild = ''
-    mkdir -p jq-prefix/src
-    cp ${jq-prefix} jq-prefix/src/jq-1.5.tar.gz
-  '';
+  libPath = stdenv.lib.makeLibraryPath [
+    zlib
+    luajit
+    ncurses
+    jsoncpp
+    curl
+    jq
+    openssl
+    libb64
+    gcc
+    stdenv.cc.cc
+  ];
 
-  postInstall = optionalString (kernel != null) ''
+  postInstall = ''
+    patchelf --set-rpath "$libPath" "$out/bin/sysdig"
+    patchelf --set-rpath "$libPath" "$out/bin/csysdig"
+  '' + optionalString (kernel != null) ''
     make install_driver
     kernel_dev=${kernel.dev}
     kernel_dev=''${kernel_dev#/nix/store/}

From 46dd9dfc520c5840423ddeeb6236b3adcd5863ef Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 26 Oct 2016 21:29:55 +0000
Subject: [PATCH 17/87] numpy: enable numpy.distutils patch only if it's also
 in distutils

Fixes: 095095c ('python: add C++ compiler support for distutils')
---
 pkgs/development/interpreters/python/cpython/2.7/default.nix | 5 +++--
 pkgs/development/python-modules/numpy.nix                    | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index 39d98b37527..a6eeee25be9 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -39,6 +39,7 @@ let
     sha256 = "0y7rl603vmwlxm6ilkhc51rx2mfj14ckcz40xxgs0ljnvlhp30yp";
   };
 
+  hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false);
   patches =
     [ # Look in C_INCLUDE_PATH and LIBRARY_PATH for stuff.
       ./search-path.patch
@@ -82,7 +83,7 @@ let
       ./2.7.3-dylib.patch
       ./2.7.3-getpath-exe-extension.patch
       ./2.7.3-no-libm.patch
-    ] ++ optionals (!(stdenv.cc.isGNU or false)) [
+    ] ++ optionals hasDistutilsCxxPatch [
 
       # Patch from http://bugs.python.org/issue1222585 adapted to work with
       # `patch -p1' and with a last hunk removed
@@ -180,7 +181,7 @@ in stdenv.mkDerivation {
       '';
 
     passthru = rec {
-      inherit libPrefix sitePackages x11Support;
+      inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch;
       executable = libPrefix;
       buildEnv = callPackage ../../wrapper.nix { python = self; };
       withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = python27Packages; };
diff --git a/pkgs/development/python-modules/numpy.nix b/pkgs/development/python-modules/numpy.nix
index d4534248159..14504d92543 100644
--- a/pkgs/development/python-modules/numpy.nix
+++ b/pkgs/development/python-modules/numpy.nix
@@ -12,7 +12,7 @@ in buildPythonPackage (args // rec {
   buildInputs = args.buildInputs or [ gfortran nose ];
   propagatedBuildInputs = args.propagatedBuildInputs or [ passthru.blas ];
 
-  patches = lib.optionals isPy27 [
+  patches = lib.optionals (python.hasDistutilsCxxPatch or false) [
     # See cpython 2.7 patches.
     # numpy.distutils is used by cython during it's check phase
     ./numpy-distutils-C++.patch

From e4773819f419618f2247a5226c3390d2fd817859 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 26 Oct 2016 09:11:37 -0400
Subject: [PATCH 18/87] kernel: 3.10.103 -> 3.10.104

---
 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 a46a75c01ca..3e6bd51cc47 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, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.10.103";
+  version = "3.10.104";
   extraMeta.branch = "3.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "008dz40zig0fhkm3hjmcn0kn5b1sfvpxb7dc4fbsddb6gifrh44v";
+    sha256 = "04kc64zdpg8h8655m825lbny3fwvqhmh3mg9h564i2irnll35lp3";
   };
 
   kernelPatches = args.kernelPatches;

From e5e84ecbbdc2477499626a9815c4ec8c265b18da Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 26 Oct 2016 09:12:13 -0400
Subject: [PATCH 19/87] kernel: 3.12.63 -> 3.12.66

---
 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 e14d722ad5d..48f12307bd1 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, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.12.63";
+  version = "3.12.66";
   extraMeta.branch = "3.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0srg7xd68n10b28c3l5qa4dx5qr84ci7fdn48wcj79y7h2s0367x";
+    sha256 = "02nac7sr0c1h10mxp5azlsmz0gsr7qllsn2hibjknhk7jg8ry8cc";
   };
 
   kernelPatches = args.kernelPatches;

From b02646f93b995dd683681fc6f2c86c056b41a2d0 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 26 Oct 2016 09:12:44 -0400
Subject: [PATCH 20/87] kernel: 3.18.42 -> 3.18.44

---
 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 75f5d6de631..4a18f2e498b 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, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.18.42";
+  version = "3.18.44";
   extraMeta.branch = "3.18";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0ymimvy8kp2a2x0h31m3sipwx1h80576ws04k3cl49wgcgjwpwn4";
+    sha256 = "1cjdh9w2q164r53k06vv6nhxwjzm69nha5wndp8r1hjywjwcqqan";
   };
 
   kernelPatches = args.kernelPatches;

From 68dd264ccd68b44f24e1fc1850f23a21cd4e8581 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 26 Oct 2016 20:11:28 -0400
Subject: [PATCH 21/87] btrfs-progs: 4.6.1 -> 4.8.2

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

diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix
index a58f2b5504b..525aa2fec28 100644
--- a/pkgs/tools/filesystems/btrfs-progs/default.nix
+++ b/pkgs/tools/filesystems/btrfs-progs/default.nix
@@ -2,14 +2,14 @@
 , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt
 }:
 
-let version = "4.6.1"; in
+let version = "4.8.2"; in
 
 stdenv.mkDerivation rec {
   name = "btrfs-progs-${version}";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
-    sha256 = "06c9l6m3w29dndk17jrlpgr01wykl10h34zva8zc2c571z6mrlaf";
+    sha256 = "0pswcfmdnfc586770h74abp67gn2xv8fd46vxlimnmn837sj7h41";
   };
 
   buildInputs = [

From da5c6541216dfde2bcfe30c817f913036b2487f3 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 26 Oct 2016 20:45:11 -0400
Subject: [PATCH 22/87] corosync: 2.3.4 -> 2.4.1

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

diff --git a/pkgs/servers/corosync/default.nix b/pkgs/servers/corosync/default.nix
index 5e8f2fd0caa..d04a1d124fa 100644
--- a/pkgs/servers/corosync/default.nix
+++ b/pkgs/servers/corosync/default.nix
@@ -7,11 +7,11 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "corosync-2.3.4";
+  name = "corosync-2.4.1";
 
   src = fetchurl {
     url = "http://build.clusterlabs.org/corosync/releases/${name}.tar.gz";
-    sha256 = "1m276b060fjghr93hdzfag81whi5ph65dc2ka8ln1igm3kxr7bix";
+    sha256 = "0w8m97ih7a2g99pmjsckw4xwbgzv96xdgg62s2a4qbgnw4yl637y";
   };
 
   buildInputs = [

From 354811f4bcb802a8032fdbb228ec82d73b15ebe8 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 26 Oct 2016 21:23:25 -0400
Subject: [PATCH 23/87] webkitgtk214x: 2.14.0 -> 2.14.1

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

diff --git a/pkgs/development/libraries/webkitgtk/2.14.nix b/pkgs/development/libraries/webkitgtk/2.14.nix
index 7439d72151d..ca74f384ec9 100644
--- a/pkgs/development/libraries/webkitgtk/2.14.nix
+++ b/pkgs/development/libraries/webkitgtk/2.14.nix
@@ -11,7 +11,7 @@ assert enableGeoLocation -> geoclue2 != null;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "webkitgtk-${version}";
-  version = "2.14.0";
+  version = "2.14.1";
 
   meta = {
     description = "Web content rendering engine, GTK+ port";
@@ -26,14 +26,14 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "02paj0anbnqn1z3hn5c4csmq9nga995rzagiplj3sjk2dj1ss4q5";
+    sha256 = "1dffnz20psgc604azhbzn9a6cdhafar9dw74w3bbwrfy531pcb9f";
   };
 
   # see if we can clean this up....
 
   patches = [ ./finding-harfbuzz-icu.patch ];
 
-  cmakeFlags = [ 
+  cmakeFlags = [
   "-DPORT=GTK"
   "-DUSE_LIBHYPHEN=0"
   "-DENABLE_GLES2=ON"

From 3e18f4bc2f7d9dc89672a62fc07b071f6f32bcdd Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 26 Oct 2016 21:23:35 -0400
Subject: [PATCH 24/87] epiphany: 3.20.3 -> 3.20.4

---
 pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix | 6 +++---
 pkgs/desktops/gnome-3/3.20/core/epiphany/src.nix     | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix
index 13efcd61392..cc31c7e7b97 100644
--- a/pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix
@@ -1,6 +1,6 @@
 { stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu
 , bash, wrapGAppsHook, gnome3, libwnck3, libxml2, libxslt, libtool
-, webkitgtk, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit
+, webkitgtk214x, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit
 , sqlite, gcr, avahi, nss, isocodes, itstool, file, which
 , gdk_pixbuf, librsvg, gnome_common }:
 
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig file wrapGAppsHook ];
 
-  buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt pkgconfig file 
-                  webkitgtk libsoup libsecret gnome_desktop libnotify libtool
+  buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt pkgconfig file
+                  webkitgtk214x libsoup libsecret gnome_desktop libnotify libtool
                   sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools
                   gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common
                   gcr avahi gnome3.gsettings_desktop_schemas gnome3.dconf
diff --git a/pkgs/desktops/gnome-3/3.20/core/epiphany/src.nix b/pkgs/desktops/gnome-3/3.20/core/epiphany/src.nix
index 457814913d6..84c94b45a59 100644
--- a/pkgs/desktops/gnome-3/3.20/core/epiphany/src.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/epiphany/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "epiphany-3.20.3";
+  name = "epiphany-3.20.4";
 
   src = fetchurl {
-    url = mirror://gnome/sources/epiphany/3.20/epiphany-3.20.3.tar.xz;
-    sha256 = "4d9de1bdb44c14adf25aa6dc02ea3de60925cff5eb01fe89545e6032c9b424a2";
+    url = mirror://gnome/sources/epiphany/3.20/epiphany-3.20.4.tar.xz;
+    sha256 = "051av2xcg7ii2y273vqmdkzanygws9qsaq7ks0070y06d4rhl6xy";
   };
 }

From 69e8bac9cd1b605440a28e4cb56a4acf6e2c0103 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 26 Oct 2016 07:48:21 -0400
Subject: [PATCH 25/87] virtualbox: 5.1.6 -> 5.1.8 for many CVEs:

From LWN:
From the NVD entries:

CVE-2016-5501: Unspecified vulnerability in the Oracle VM VirtualBox
component before 5.0.28 and 5.1.x before 5.1.8 in Oracle
Virtualization allows local users to affect confidentiality,
integrity, and availability via vectors related to Core, a different
vulnerability than CVE-2016-5538.

CVE-2016-5538: Unspecified vulnerability in the Oracle VM VirtualBox
component before 5.0.28 and 5.1.x before 5.1.8 in Oracle
Virtualization allows local users to affect confidentiality,
integrity, and availability via vectors related to Core, a different
vulnerability than CVE-2016-5501.

CVE-2016-5605: Unspecified vulnerability in the Oracle VM VirtualBox
component before 5.1.4 in Oracle Virtualization allows remote
attackers to affect confidentiality and integrity via vectors related
to VRDE.

CVE-2016-5608: Unspecified vulnerability in the Oracle VM VirtualBox
component before 5.0.28 and 5.1.x before 5.1.8 in Oracle
Virtualization allows local users to affect availability via vectors
related to Core, a different vulnerability than CVE-2016-5613.

CVE-2016-5610: Unspecified vulnerability in the Oracle VM VirtualBox
component before 5.0.28 and 5.1.x before 5.1.8 in Oracle
Virtualization allows local users to affect confidentiality,
integrity, and availability via vectors related to Core.

CVE-2016-5611: Unspecified vulnerability in the Oracle VM VirtualBox
component before 5.0.28 and 5.1.x before 5.1.8 in Oracle
Virtualization allows local users to affect confidentiality via
vectors related to Core.

CVE-2016-5613: Unspecified vulnerability in the Oracle VM VirtualBox
component before 5.0.28 and 5.1.x before 5.1.8 in Oracle
Virtualization allows local users to affect availability via vectors
related to Core, a different vulnerability than CVE-2016-5608.
---
 .../virtualization/virtualbox/default.nix     |  2 +-
 .../virtualization/virtualbox/libressl.patch  | 47 -------------------
 .../virtualbox/upstream-info.json             | 10 ++--
 3 files changed, 6 insertions(+), 53 deletions(-)
 delete mode 100644 pkgs/applications/virtualization/virtualbox/libressl.patch

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index ef834897022..64275448651 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -81,7 +81,7 @@ in stdenv.mkDerivation {
   '';
 
   patches = optional enableHardening ./hardened.patch
-    ++ [ ./libressl.patch ./qtx11extras.patch ];
+    ++ [ ./qtx11extras.patch ];
 
   postPatch = ''
     sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \
diff --git a/pkgs/applications/virtualization/virtualbox/libressl.patch b/pkgs/applications/virtualization/virtualbox/libressl.patch
deleted file mode 100644
index db9b7e7a59d..00000000000
--- a/pkgs/applications/virtualization/virtualbox/libressl.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/src/VBox/Runtime/common/crypto/digest-builtin.cpp b/src/VBox/Runtime/common/crypto/digest-builtin.cpp
-index 66b4304..1aaceff 100644
---- a/src/VBox/Runtime/common/crypto/digest-builtin.cpp
-+++ b/src/VBox/Runtime/common/crypto/digest-builtin.cpp
-@@ -561,7 +561,7 @@ static PCRTCRDIGESTDESC const g_apDigestOps[] =
-  * OpenSSL EVP.
-  */
- 
--# if OPENSSL_VERSION_NUMBER >= 0x10100000
-+# if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
- /** @impl_interface_method{RTCRDIGESTDESC::pfnNew} */
- static DECLCALLBACK(void*) rtCrDigestOsslEvp_New(void)
- {
-@@ -597,7 +597,7 @@ static DECLCALLBACK(int) rtCrDigestOsslEvp_Init(void *pvState, void *pvOpaque, b
-     if (fReInit)
-     {
-         pEvpType = EVP_MD_CTX_md(pThis);
--# if OPENSSL_VERSION_NUMBER >= 0x10100000
-+# if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
-         EVP_MD_CTX_reset(pThis);
- # else
-         EVP_MD_CTX_cleanup(pThis);
-@@ -616,7 +616,7 @@ static DECLCALLBACK(int) rtCrDigestOsslEvp_Init(void *pvState, void *pvOpaque, b
- static DECLCALLBACK(void) rtCrDigestOsslEvp_Delete(void *pvState)
- {
-     EVP_MD_CTX *pThis = (EVP_MD_CTX *)pvState;
--# if OPENSSL_VERSION_NUMBER >= 0x10100000
-+# if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
-     EVP_MD_CTX_reset(pThis);
- # else
-     EVP_MD_CTX_cleanup(pThis);
-@@ -661,13 +661,13 @@ static RTCRDIGESTDESC const g_rtCrDigestOpenSslDesc =
-     NULL,
-     RTDIGESTTYPE_UNKNOWN,
-     EVP_MAX_MD_SIZE,
--# if OPENSSL_VERSION_NUMBER >= 0x10100000
-+# if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
-     0,
- # else
-     sizeof(EVP_MD_CTX),
- # endif
-     0,
--# if OPENSSL_VERSION_NUMBER >= 0x10100000
-+# if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
-     rtCrDigestOsslEvp_New,
-     rtCrDigestOsslEvp_Free,
- # else
diff --git a/pkgs/applications/virtualization/virtualbox/upstream-info.json b/pkgs/applications/virtualization/virtualbox/upstream-info.json
index 3a386004a3f..d861a7e7932 100644
--- a/pkgs/applications/virtualization/virtualbox/upstream-info.json
+++ b/pkgs/applications/virtualization/virtualbox/upstream-info.json
@@ -1,8 +1,8 @@
 {
   "__NOTE": "Generated using update.py from the same directory.",
-  "extpack": "607ac3636bd49a738d5c48159b39261369b5487f71fb10afa2ecf869627a12de",
-  "extpackRev": "110634",
-  "guest": "cbcf9b9b1000e09911b3d20e1efe529aef8a945cf130f6abffc14a39522cc1ed",
-  "main": "2e0112b0d85841587b8f212e6ba8f6c35b31e1cce6b6999497dc917cd37e6911",
-  "version": "5.1.6"
+  "extpack": "d28bcd01c14eb07eedd2b964d1abe4876f0a7e0e89530e7ba285a5d6267bf322",
+  "extpackRev": "111374",
+  "guest": "347fd39df6ddee8079ad41fbc038e2fb64952a40255d75292e8e49a0a0cbf657",
+  "main": "e447031de468aee746529b2cf60768922f9beff22a13c54284aa430f5e925933",
+  "version": "5.1.8"
 }

From 8f6470f33a8e330c87283447862045d67a5578be Mon Sep 17 00:00:00 2001
From: Manuel Reinhardt <reinhardt@syslab.com>
Date: Thu, 27 Oct 2016 08:31:49 +0100
Subject: [PATCH 26/87] duplicity: updated dependencies fixes #18112
 https://github.com/NixOS/nixpkgs/issues/18112

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

diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix
index 3a955bdbfec..c63e6c515a5 100644
--- a/pkgs/tools/backup/duplicity/default.nix
+++ b/pkgs/tools/backup/duplicity/default.nix
@@ -3,7 +3,7 @@
 
 let
   version = "0.7.07.1";
-  inherit (python2Packages) boto ecdsa lockfile paramiko pycrypto python setuptools;
+  inherit (python2Packages) boto cffi cryptography ecdsa enum idna ipaddress lockfile paramiko pyasn1 pycrypto python setuptools six;
 in stdenv.mkDerivation {
   name = "duplicity-${version}";
 
@@ -15,10 +15,10 @@ in stdenv.mkDerivation {
   installPhase = ''
     python setup.py install --prefix=$out
     wrapProgram $out/bin/duplicity \
-      --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pycrypto}):$(toPythonPath ${ecdsa}):$(toPythonPath ${paramiko}):$(toPythonPath ${boto}):$(toPythonPath ${lockfile})" \
+      --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${idna}):$(toPythonPath ${cffi}):$(toPythonPath ${ipaddress}):$(toPythonPath ${pyasn1}):$(toPythonPath ${six}):$(toPythonPath ${enum}):$(toPythonPath ${setuptools}):$(toPythonPath ${cryptography}):$(toPythonPath ${pycrypto}):$(toPythonPath ${ecdsa}):$(toPythonPath ${paramiko}):$(toPythonPath ${boto}):$(toPythonPath ${lockfile})" \
       --prefix PATH : "${stdenv.lib.makeBinPath [ gnupg ncftp rsync ]}"
     wrapProgram $out/bin/rdiffdir \
-      --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pycrypto}):$(toPythonPath ${ecdsa}):$(toPythonPath ${paramiko}):$(toPythonPath ${boto}):$(toPythonPath ${lockfile})"
+      --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${idna}):$(toPythonPath ${cffi}):$(toPythonPath ${ipaddress}):$(toPythonPath ${pyasn1}):$(toPythonPath ${six}):$(toPythonPath ${enum}):$(toPythonPath ${setuptools}):$(toPythonPath ${cryptography}):$(toPythonPath ${pycrypto}):$(toPythonPath ${ecdsa}):$(toPythonPath ${paramiko}):$(toPythonPath ${boto}):$(toPythonPath ${lockfile})"
   '';
 
   buildInputs = [ python librsync makeWrapper setuptools ];

From 63dc801899df20af143f6a54d2553290983264ff Mon Sep 17 00:00:00 2001
From: makefu <makefu@syntax-fehler.de>
Date: Wed, 19 Oct 2016 20:26:08 +0200
Subject: [PATCH 27/87] devpi-client: 2.3.2 -> 2.7.0

devpi-common: 2.0.8 -> 3.0.1
---
 pkgs/development/tools/devpi-client/default.nix | 4 ++--
 pkgs/top-level/python-packages.nix              | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix
index c33a277d6b2..f724b65dd82 100644
--- a/pkgs/development/tools/devpi-client/default.nix
+++ b/pkgs/development/tools/devpi-client/default.nix
@@ -2,11 +2,11 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "devpi-client-${version}";
-  version = "2.3.2";
+  version = "2.7.0";
 
   src = fetchurl {
     url = "mirror://pypi/d/devpi-client/${name}.tar.gz";
-    sha256 = "22484d6a1ccc957d3e4f857e428244fb27c042baedd3bf28fe7522cd89d8ff45";
+    sha256 = "0z7vaf0a66n82mz0vx122pbynjvkhp2mjf9lskgyv09y3bxzzpj3";
   };
 
   doCheck = false;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 652c9cf5c4b..043bc604501 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3151,11 +3151,11 @@ in {
 
   devpi-common = buildPythonPackage rec {
     name = "devpi-common";
-    version = "2.0.8";
+    version = "3.0.1";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/d/devpi-common/devpi-common-${version}.tar.gz";
-      sha256 = "a059c4099002d4af8f3ccfc8a9f4bf133b20ea404049b21a31fc1003e1d79452";
+      sha256 = "0l3a7iyk596x6pvzg7604lzzi012qszr804fqn6f517zcy1xz23j";
     };
 
     propagatedBuildInputs = [ self.requests2 self.py ];
@@ -3164,7 +3164,7 @@ in {
       homepage = https://bitbucket.org/hpk42/devpi;
       description = "Utilities jointly used by devpi-server and devpi-client";
       license = licenses.mit;
-      maintainers = with maintainers; [ lewo ];
+      maintainers = with maintainers; [ lewo makefu ];
     };
   };
 

From 5f3f810e27c8a355e86946e1044a9d13caf7667e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Wed, 26 Oct 2016 14:21:50 +0200
Subject: [PATCH 28/87] influxdb: make v1.0.2 default, remove 0.13

---
 pkgs/servers/nosql/influxdb/default.nix       |  15 +-
 .../nosql/influxdb/deps-0.13.0.json.nix       |   0
 pkgs/servers/nosql/influxdb/deps-0.13.0.nix   | 200 ------------------
 pkgs/servers/nosql/influxdb/gdm2nix.rb        |  39 ----
 pkgs/servers/nosql/influxdb/v0.nix            |  13 --
 pkgs/servers/nosql/influxdb/v1.nix            |  13 --
 pkgs/top-level/all-packages.nix               |   4 +-
 7 files changed, 11 insertions(+), 273 deletions(-)
 delete mode 100644 pkgs/servers/nosql/influxdb/deps-0.13.0.json.nix
 delete mode 100644 pkgs/servers/nosql/influxdb/deps-0.13.0.nix
 delete mode 100755 pkgs/servers/nosql/influxdb/gdm2nix.rb
 delete mode 100644 pkgs/servers/nosql/influxdb/v0.nix
 delete mode 100644 pkgs/servers/nosql/influxdb/v1.nix

diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix
index 1614049bf22..b2cc7afb804 100644
--- a/pkgs/servers/nosql/influxdb/default.nix
+++ b/pkgs/servers/nosql/influxdb/default.nix
@@ -1,16 +1,21 @@
-{ lib, buildGoPackage, fetchFromGitHub, src, version }:
+{ lib, buildGoPackage, fetchFromGitHub, }:
 
 buildGoPackage rec {
   name = "influxdb-${version}";
+  version = "1.0.2";
+
+  src = fetchFromGitHub {
+    owner = "influxdata";
+    repo = "influxdb";
+    rev = "v${version}";
+    sha256 = "0z8y995gm2hpxny7l5nx5fjc5c26hfgvghwmzva8d1mrlnapcsyc";
+  };
 
   goPackagePath = "github.com/influxdata/influxdb";
 
   excludedPackages = "test";
-  
-  inherit src;
 
-  # Generated with the `gdm2nix.rb` script and the `Godeps` file from the
-  # influxdb repo root.
+  # Generated with the nix2go
   goDeps = ./. + builtins.toPath "/deps-${version}.nix";
 
   meta = with lib; {
diff --git a/pkgs/servers/nosql/influxdb/deps-0.13.0.json.nix b/pkgs/servers/nosql/influxdb/deps-0.13.0.json.nix
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/pkgs/servers/nosql/influxdb/deps-0.13.0.nix b/pkgs/servers/nosql/influxdb/deps-0.13.0.nix
deleted file mode 100644
index 1b8885a1a0f..00000000000
--- a/pkgs/servers/nosql/influxdb/deps-0.13.0.nix
+++ /dev/null
@@ -1,200 +0,0 @@
-[
-{
-  goPackagePath = "collectd.org";
-  fetch = {
-    type = "git";
-    url = "https://github.com/collectd/go-collectd.git";
-    rev = "9fc824c70f713ea0f058a07b49a4c563ef2a3b98";
-    sha256 = "0kjal6bsjpnppfnlqbg7g56xwssaj2ani499yykyj817zq56hi0w";
-  };
-}
-{
-  goPackagePath = "github.com/BurntSushi/toml";
-  fetch = {
-    type = "git";
-    url = "https://github.com/BurntSushi/toml.git";
-    rev = "a4eecd407cf4129fc902ece859a0114e4cf1a7f4";
-    sha256 = "1l74zvd534k2fs73gmaq4mgl48p1i9559k1gwq4vakca727z5sgf";
-  };
-}
-{
-  goPackagePath = "github.com/armon/go-metrics";
-  fetch = {
-    type = "git";
-    url = "https://github.com/armon/go-metrics.git";
-    rev = "345426c77237ece5dab0e1605c3e4b35c3f54757";
-    sha256 = "13bp2ykqhnhzif7wzrwsg54c2b0czhgs9csbvzbvc93n72s59jh5";
-  };
-}
-{
-  goPackagePath = "github.com/bmizerany/pat";
-  fetch = {
-    type = "git";
-    url = "https://github.com/bmizerany/pat.git";
-    rev = "b8a35001b773c267eb260a691f4e5499a3531600";
-    sha256 = "11zxd45rvjm6cn3wzbi18wy9j4vr1r1hgg6gzlqnxffiizkycxmz";
-  };
-}
-{
-  goPackagePath = "github.com/boltdb/bolt";
-  fetch = {
-    type = "git";
-    url = "https://github.com/boltdb/bolt.git";
-    rev = "2f846c3551b76d7710f159be840d66c3d064abbe";
-    sha256 = "0cvpcgmzlrn87jqrflwf4pciz6i25ri1r83sq7v1z9zry1ah16r5";
-  };
-}
-{
-  goPackagePath = "github.com/davecgh/go-spew";
-  fetch = {
-    type = "git";
-    url = "https://github.com/davecgh/go-spew.git";
-    rev = "fc32781af5e85e548d3f1abaf0fa3dbe8a72495c";
-    sha256 = "1dwwd4va0qnyr256i7n8d4g24d7yyvwd0975y6v4dy06qpwir232";
-  };
-}
-{
-  goPackagePath = "github.com/dgryski/go-bits";
-  fetch = {
-    type = "git";
-    url = "https://github.com/dgryski/go-bits.git";
-    rev = "86c69b3c986f9d40065df5bd8f765796549eef2e";
-    sha256 = "08i3p8lcisr88gmwvi8qdc8bgksxh5ydjspgfbi4aba9msybp78b";
-  };
-}
-{
-  goPackagePath = "github.com/dgryski/go-bitstream";
-  fetch = {
-    type = "git";
-    url = "https://github.com/dgryski/go-bitstream.git";
-    rev = "27cd5973303fde7d914860be1ea4b927a6be0c92";
-    sha256 = "12ji4vcfy0cz12yq43cz0w1f1k4c1kg0vwpsk1iy47kc38kzdkc6";
-  };
-}
-{
-  goPackagePath = "github.com/gogo/protobuf";
-  fetch = {
-    type = "git";
-    url = "https://github.com/gogo/protobuf.git";
-    rev = "74b6e9deaff6ba6da1389ec97351d337f0d08b06";
-    sha256 = "0045fz4bx72rikm2ggx9j1h3yrq518299qwaizrgy5jvxzj1707b";
-  };
-}
-{
-  goPackagePath = "github.com/golang/snappy";
-  fetch = {
-    type = "git";
-    url = "https://github.com/golang/snappy.git";
-    rev = "5979233c5d6225d4a8e438cdd0b411888449ddab";
-    sha256 = "0i0pvwc2a4xgsns6mr3xbc6p0sra34qsaagd7yf7v1as0z7ydl3s";
-  };
-}
-{
-  goPackagePath = "github.com/hashicorp/go-msgpack";
-  fetch = {
-    type = "git";
-    url = "https://github.com/hashicorp/go-msgpack.git";
-    rev = "fa3f63826f7c23912c15263591e65d54d080b458";
-    sha256 = "1f6rd6bm2dm2rk46x8cqrxh5nks1gpk6dvvsag7s5pdjgdxy951k";
-  };
-}
-{
-  goPackagePath = "github.com/hashicorp/raft";
-  fetch = {
-    type = "git";
-    url = "https://github.com/hashicorp/raft.git";
-    rev = "8fd9a2fdfd154f4b393aa24cff91e3c317efe839";
-    sha256 = "04k03x6r6h2xwxfvbzicfdblifdjn35agw9kwla6akw6l54ygy0f";
-  };
-}
-{
-  goPackagePath = "github.com/hashicorp/raft-boltdb";
-  fetch = {
-    type = "git";
-    url = "https://github.com/hashicorp/raft-boltdb.git";
-    rev = "d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee";
-    sha256 = "0p609w6x0h6bapx4b0d91dxnp2kj7dv0534q4blyxp79shv2a8ia";
-  };
-}
-{
-  goPackagePath = "github.com/influxdata/usage-client";
-  fetch = {
-    type = "git";
-    url = "https://github.com/influxdata/usage-client.git";
-    rev = "475977e68d79883d9c8d67131c84e4241523f452";
-    sha256 = "0yhywablqqpd2x70rax1kf7yaw1jpvrc2gks8360cwisda57d3qy";
-  };
-}
-{
-  goPackagePath = "github.com/jwilder/encoding";
-  fetch = {
-    type = "git";
-    url = "https://github.com/jwilder/encoding.git";
-    rev = "b421ab402545ef5a119f4f827784c6551d9bfc37";
-    sha256 = "0sjz2cl8kpni0mh0y4269k417dj06gn2y0ppi25i3wh9p4j4i4fq";
-  };
-}
-{
-  goPackagePath = "github.com/kimor79/gollectd";
-  fetch = {
-    type = "git";
-    url = "https://github.com/kimor79/gollectd.git";
-    rev = "61d0deeb4ffcc167b2a1baa8efd72365692811bc";
-    sha256 = "0als2v4d5hlw0sqam670p3fi471ikgl3l81bp31mf3s3jssdxwfs";
-  };
-}
-{
-  goPackagePath = "github.com/paulbellamy/ratecounter";
-  fetch = {
-    type = "git";
-    url = "https://github.com/paulbellamy/ratecounter.git";
-    rev = "5a11f585a31379765c190c033b6ad39956584447";
-    sha256 = "137p62imi91zhkjcjigdd64n7f9z6djjpsxcyifgrcxs41jj9ra0";
-  };
-}
-{
-  goPackagePath = "github.com/peterh/liner";
-  fetch = {
-    type = "git";
-    url = "https://github.com/peterh/liner.git";
-    rev = "82a939e738b0ee23e84ec7a12d8e216f4d95c53f";
-    sha256 = "1187c1rqmh9k9ap5bz3p9hbjp3ad5hysykh58kgv5clah1jbkg04";
-  };
-}
-{
-  goPackagePath = "github.com/rakyll/statik";
-  fetch = {
-    type = "git";
-    url = "https://github.com/rakyll/statik.git";
-    rev = "274df120e9065bdd08eb1120e0375e3dc1ae8465";
-    sha256 = "0llk7bxmk66wdiy42h32vj1jfk8zg351xq21hwhrq7gkfljghffp";
-  };
-}
-{
-  goPackagePath = "golang.org/x/crypto";
-  fetch = {
-    type = "git";
-    url = "https://github.com/golang/crypto.git";
-    rev = "1f22c0103821b9390939b6776727195525381532";
-    sha256 = "1acy12f396sr3lrnbcnym5q72qnlign5bagving41qijzjnc219m";
-  };
-}
-{
-  goPackagePath = "golang.org/x/tools";
-  fetch = {
-    type = "git";
-    url = "https://github.com/golang/tools.git";
-    rev = "8b178a93c1f5b5c8f4e36cd6bd64e0d5bf0ee180";
-    sha256 = "0rqm56c4acrvyqsp53dkzr34pkz922x4rwknaslwlbkyc4gyg2c8";
-  };
-}
-{
-  goPackagePath = "gopkg.in/fatih/pool.v2";
-  fetch = {
-    type = "git";
-    url = "https://github.com/fatih/pool.git";
-    rev = "cba550ebf9bce999a02e963296d4bc7a486cb715";
-    sha256 = "1jlrakgnpvhi2ny87yrsj1gyrcncfzdhypa9i2mlvvzqlj4r0dn0";
-  };
-}
-]
diff --git a/pkgs/servers/nosql/influxdb/gdm2nix.rb b/pkgs/servers/nosql/influxdb/gdm2nix.rb
deleted file mode 100755
index 4feb78f54bb..00000000000
--- a/pkgs/servers/nosql/influxdb/gdm2nix.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env ruby
-#
-#
-require "json"
-
-redirects = {
-  "collectd.org" => "github.com/collectd/go-collectd",
-  "git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git" => "github.com/eclipse/paho.mqtt.golang",
-  "golang.org/x/net" => "github.com/golang/net",
-  "golang.org/x/crypto" => "github.com/golang/crypto",
-  "golang.org/x/text" => "github.com/golang/text",
-  "golang.org/x/tools" => "github.com/golang/tools",
-  "gopkg.in/fatih/pool.v2" => "github.com/fatih/pool",
-}
-
-godeps = ARGV[0] || "Godeps"
-
-deps = File.read(godeps).lines.map do |line|
-  (name, rev) = line.split(" ")
-
-  host = redirects.fetch(name, name)
-
-  url = "https://#{host}.git"
-
-  xxx = JSON.load(`nix-prefetch-git #{url} #{rev}`)
-
-  {
-    goPackagePath: name,
-    fetch: {
-      type: "git",
-      url: url,
-      rev: rev,
-      sha256: xxx['sha256'],
-    }
-  }
-end
-
-#TODO: move to deps.nix in NIXON format
-File.write("deps.json", JSON.pretty_generate(deps))
diff --git a/pkgs/servers/nosql/influxdb/v0.nix b/pkgs/servers/nosql/influxdb/v0.nix
deleted file mode 100644
index fca5f8ba622..00000000000
--- a/pkgs/servers/nosql/influxdb/v0.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ lib, buildGoPackage, fetchFromGitHub }@args:
-
-import ./default.nix (args // rec {
-  
-  version = "0.13.0";
-
-  src = fetchFromGitHub {
-    owner = "influxdata";
-    repo = "influxdb";
-    rev = "v${version}";
-    sha256 = "0f7af5jb1f65qnslhc7zccml1qvk6xx5naczqfsf4s1zc556fdi4";
-  };
-}) 
diff --git a/pkgs/servers/nosql/influxdb/v1.nix b/pkgs/servers/nosql/influxdb/v1.nix
deleted file mode 100644
index 57d62a596e3..00000000000
--- a/pkgs/servers/nosql/influxdb/v1.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ lib, buildGoPackage, fetchFromGitHub }@args:
-
-import ./default.nix (args // rec {
-  
-  version = "1.0.2";
-
-  src = fetchFromGitHub {
-    owner = "influxdata";
-    repo = "influxdb";
-    rev = "v${version}";
-    sha256 = "0z8y995gm2hpxny7l5nx5fjc5c26hfgvghwmzva8d1mrlnapcsyc";
-  };
-}) 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 074b601fdaa..e94863037d4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10141,9 +10141,7 @@ in
 
   riak = callPackage ../servers/nosql/riak/2.1.1.nix { };
 
-  influxdb = callPackage ../servers/nosql/influxdb/v0.nix { };
-
-  influxdb10 = callPackage ../servers/nosql/influxdb/v1.nix { };
+  influxdb = callPackage ../servers/nosql/influxdb { };
 
   mysql55 = callPackage ../servers/sql/mysql/5.5.x.nix {
     inherit (darwin) cctools;

From 167e4b351a10e6f3c4f13d90db97691607d475fb Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Thu, 27 Oct 2016 07:52:23 -0200
Subject: [PATCH 29/87] jwm: 1548 -> 1563

---
 .../window-managers/jwm/default.nix            | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix
index c3425afd988..47130ac71ec 100644
--- a/pkgs/applications/window-managers/jwm/default.nix
+++ b/pkgs/applications/window-managers/jwm/default.nix
@@ -1,15 +1,17 @@
-{ stdenv, fetchurl, pkgconfig, automake, autoconf, libtool, gettext, which,
-  xorg, libX11, libXext, libXinerama, libXpm, libXft, libXau, libXdmcp,
-  libXmu, libpng, libjpeg, expat, xproto, xextproto, xineramaproto, librsvg,
-  freetype, fontconfig }:
+{ stdenv, fetchFromGitHub, pkgconfig, automake, autoconf, libtool,
+  gettext, which, xorg, libX11, libXext, libXinerama, libXpm, libXft,
+  libXau, libXdmcp, libXmu, libpng, libjpeg, expat, xproto, xextproto,
+  xineramaproto, librsvg, freetype, fontconfig }:
 
 stdenv.mkDerivation rec {
   name = "jwm-${version}";
-  version = "1548";
+  version = "1563";
   
-  src = fetchurl {
-     url = "https://github.com/joewing/jwm/archive/s${version}.tar.gz";
-     sha256 = "1ih5y7567vwcbnkjwm3cc9iq4n9rzz818mkh6ryli9ld230hla5r";
+  src = fetchFromGitHub {
+    owner = "joewing";
+    repo = "jwm";
+    rev = "s${version}";
+    sha256 = "0xfrsk0cffc0fmlmq1340ylzdcmancn2bwgzv6why3gklxplsp9z";
   };
 
   nativeBuildInputs = [ pkgconfig automake autoconf libtool gettext which ];

From f9f23084d9b0069b9ae1e77d835abc457ba515b6 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 27 Oct 2016 12:17:16 +0200
Subject: [PATCH 30/87] pari_alpha: fix source link

---
 pkgs/applications/science/math/pari/alpha.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/math/pari/alpha.nix b/pkgs/applications/science/math/pari/alpha.nix
index 510928a8bf2..2f94d636037 100644
--- a/pkgs/applications/science/math/pari/alpha.nix
+++ b/pkgs/applications/science/math/pari/alpha.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "pari-${version}";
 
   src = fetchurl {
-    url = "http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz";
+    url = "http://pari.math.u-bordeaux.fr/pub/pari/testing/${name}.tar.gz";
     sha256 = "1nrjybrqv55p669rmlkghb940hzf63vnpn34sbwhy9zlbw3hg305";
   };
 

From 6d4aa25e35717501cc814f5172cc3d0ebfbdcc42 Mon Sep 17 00:00:00 2001
From: AbigailBuccaneer <AbigailBuccaneer@users.noreply.github.com>
Date: Tue, 25 Oct 2016 16:04:05 +0100
Subject: [PATCH 31/87] pythonPackages.markdown-macros: init at 0.1.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 043bc604501..228747f6a21 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13721,6 +13721,38 @@ in {
     };
   };
 
+  markdown-macros = buildPythonPackage rec {
+    name = "markdown-macros-${version}";
+    version = "0.1.2";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/m/markdown-macros/${name}.tar.gz";
+      sha256 = "1lzvrb7nci22yp21ab2qqc9p0fhkazqj29vw0wln2r4ckb2nbawv";
+    };
+
+    patches = [
+      # Fixes a bug with markdown>2.4
+      (pkgs.fetchpatch {
+        url = "https://github.com/wnielson/markdown-macros/pull/1.patch";
+        sha256 = "17njbgq2srzkf03ar6yn92frnsbda3g45cdi529fdh0x8mmyxci0";
+      })
+    ];
+
+    prePatch = ''
+      substituteInPlace setup.py --replace "distribute" "setuptools"
+    '';
+
+    propagatedBuildInputs = with self; [ markdown ];
+
+    doCheck = false;
+
+    meta = {
+      description = "An extension for python-markdown that makes writing trac-like macros easy";
+      homepage = https://github.com/wnielson/markdown-macros;
+      license = licenses.mit;
+      maintainers = [ maintainers.abigailbuccaneer ];
+    };
+  };
 
   mathics = buildPythonPackage rec {
     name = "mathics-${version}";

From c9204f72068455d29781b0659412ca16fb2e6caa Mon Sep 17 00:00:00 2001
From: Zero King <l2dy@icloud.com>
Date: Thu, 27 Oct 2016 11:55:08 +0000
Subject: [PATCH 32/87] nmap: 7.12 -> 7.31 (#19923)

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

diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix
index 847faa2479e..9413f992086 100644
--- a/pkgs/tools/security/nmap/default.nix
+++ b/pkgs/tools/security/nmap/default.nix
@@ -22,11 +22,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nmap${optionalString graphicalSupport "-graphical"}-${version}";
-  version = "7.12";
+  version = "7.31";
 
   src = fetchurl {
-    url = "http://nmap.org/dist/nmap-${version}.tar.bz2";
-    sha256 = "014vagh9ak10hidwzp9s6g30y5h5fhsh8wykcnc1hnn9hwm0ipv3";
+    url = "https://nmap.org/dist/nmap-${version}.tar.bz2";
+    sha256 = "0hiqb28950kn4bjsmw0ksfyss7j2qdmgrj3xsjf7073pq01lx7yb";
   };
 
   patches = ./zenmap.patch;

From b86310fccf878825e34530ae17051ad3c209f3bf Mon Sep 17 00:00:00 2001
From: Tim Steinbach <NeQuissimus@users.noreply.github.com>
Date: Thu, 27 Oct 2016 07:57:56 -0400
Subject: [PATCH 33/87] wpa_supplicant: 2.5 -> 2.6 (#19913)

---
 .../linux/wpa_supplicant/default.nix          |  5 +-
 .../linux/wpa_supplicant/libressl.patch       | 69 -------------------
 2 files changed, 2 insertions(+), 72 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/wpa_supplicant/libressl.patch

diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index a3e9e930f5e..fe0d2ca28f9 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -4,13 +4,13 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  version = "2.5";
+  version = "2.6";
 
   name = "wpa_supplicant-${version}";
 
   src = fetchurl {
     url = "http://hostap.epitest.fi/releases/${name}.tar.gz";
-    sha256 = "05mkp5bx1c3z7h5biddsv0p49gkrq9ksany3anp4wdiv92p5prfc";
+    sha256 = "0l0l5gz3d5j9bqjsbjlfcv4w4jwndllp9fmyai4x9kg6qhs6v4xl";
   };
 
   # TODO: Patch epoll so that the dbus actually responds
@@ -79,7 +79,6 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./build-fix.patch
-    ./libressl.patch
   ];
 
   postInstall = ''
diff --git a/pkgs/os-specific/linux/wpa_supplicant/libressl.patch b/pkgs/os-specific/linux/wpa_supplicant/libressl.patch
deleted file mode 100644
index 0de3810dacc..00000000000
--- a/pkgs/os-specific/linux/wpa_supplicant/libressl.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-$OpenBSD: patch-src_crypto_tls_openssl_c,v 1.3 2015/09/29 11:57:54 dcoppa Exp $
-
-Compatibility fixes for LibreSSL
-
---- a/src/crypto/tls_openssl.c	Sun Sep 27 21:02:05 2015
-+++ b/src/crypto/tls_openssl.c	Mon Sep 28 13:43:46 2015
-@@ -2229,7 +2229,7 @@ static int tls_parse_pkcs12(struct tls_data *data, SSL
- 	}
- 
- 	if (certs) {
--#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
- 		SSL_clear_chain_certs(ssl);
- 		while ((cert = sk_X509_pop(certs)) != NULL) {
- 			X509_NAME_oneline(X509_get_subject_name(cert), buf,
-@@ -2247,7 +2247,7 @@ static int tls_parse_pkcs12(struct tls_data *data, SSL
- 			/* Try to continue anyway */
- 		}
- 		sk_X509_free(certs);
--#ifndef OPENSSL_IS_BORINGSSL
-+#if !defined(OPENSSL_IS_BORINGSSL) && !defined(LIBRESSL_VERSION_NUMBER)
- 		res = SSL_build_cert_chain(ssl,
- 					   SSL_BUILD_CHAIN_FLAG_CHECK |
- 					   SSL_BUILD_CHAIN_FLAG_IGNORE_ERROR);
-@@ -2812,7 +2812,7 @@ int tls_connection_get_random(void *ssl_ctx, struct tl
- 	if (conn == NULL || keys == NULL)
- 		return -1;
- 	ssl = conn->ssl;
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 	if (ssl == NULL || ssl->s3 == NULL || ssl->session == NULL)
- 		return -1;
- 
-@@ -2841,7 +2841,7 @@ int tls_connection_get_random(void *ssl_ctx, struct tl
- #ifndef CONFIG_FIPS
- static int openssl_get_keyblock_size(SSL *ssl)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 	const EVP_CIPHER *c;
- 	const EVP_MD *h;
- 	int md_size;
-@@ -2911,7 +2911,7 @@ static int openssl_tls_prf(struct tls_connection *conn
- 		   "mode");
- 	return -1;
- #else /* CONFIG_FIPS */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 	SSL *ssl;
- 	u8 *rnd;
- 	int ret = -1;
-@@ -3394,7 +3394,7 @@ int tls_connection_set_cipher_list(void *tls_ctx, stru
- 
- 	wpa_printf(MSG_DEBUG, "OpenSSL: cipher suites: %s", buf + 1);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- #if defined(EAP_FAST) || defined(EAP_FAST_DYNAMIC) || defined(EAP_SERVER_FAST)
- 	if (os_strstr(buf, ":ADH-")) {
- 		/*
-@@ -3977,7 +3977,7 @@ static int tls_sess_sec_cb(SSL *s, void *secret, int *
- 	struct tls_connection *conn = arg;
- 	int ret;
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 	if (conn == NULL || conn->session_ticket_cb == NULL)
- 		return 0;
- 

From 79d216b8f4f1881a99b00dfca2f84e3d735edcd9 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 26 Oct 2016 01:55:52 +0200
Subject: [PATCH 34/87] cjdns service: whitespace cleanup

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

diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix
index cb00139c5f1..6c0e77c081f 100644
--- a/nixos/modules/services/networking/cjdns.nix
+++ b/nixos/modules/services/networking/cjdns.nix
@@ -112,11 +112,11 @@ in
           "49275fut6tmzu354pq70sr5b95qq0vj"
         ];
         description = ''
-          Any remote cjdns nodes that offer these passwords on 
+          Any remote cjdns nodes that offer these passwords on
           connection will be allowed to route through this node.
         '';
       };
-    
+
       admin = {
         bind = mkOption {
           type = types.string;

From afe67f28a31484b4a33e8a2f9126ebc19d8a1809 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 26 Oct 2016 01:30:21 +0200
Subject: [PATCH 35/87] cjdns service: use cfg.enable shortcut

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

diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix
index 6c0e77c081f..8fad0cd07de 100644
--- a/nixos/modules/services/networking/cjdns.nix
+++ b/nixos/modules/services/networking/cjdns.nix
@@ -201,7 +201,7 @@ in
 
   };
 
-  config = mkIf config.services.cjdns.enable {
+  config = mkIf cfg.enable {
 
     boot.kernelModules = [ "tun" ];
 

From 5fba586650464528d5be247f29eef3fc05950ba5 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 24 Oct 2016 20:32:43 +0200
Subject: [PATCH 36/87] cjdns service: better types

- types.string -> str, string is deprecated
- change type of confFile option to nullOr path, makes more sense
---
 nixos/modules/services/networking/cjdns.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix
index 8fad0cd07de..c0955811e54 100644
--- a/nixos/modules/services/networking/cjdns.nix
+++ b/nixos/modules/services/networking/cjdns.nix
@@ -95,8 +95,8 @@ in
       };
 
       confFile = mkOption {
-        type = types.str;
-        default = "";
+        type = types.nullOr types.path;
+        default = null;
         example = "/etc/cjdroute.conf";
         description = ''
           Ignore all other cjdns options and load configuration from this file.
@@ -119,7 +119,7 @@ in
 
       admin = {
         bind = mkOption {
-          type = types.string;
+          type = types.str;
           default = "127.0.0.1:11234";
           description = ''
             Bind the administration port to this address and port.
@@ -129,7 +129,7 @@ in
 
       UDPInterface = {
         bind = mkOption {
-          type = types.string;
+          type = types.str;
           default = "";
           example = "192.168.1.32:43211";
           description = ''
@@ -154,6 +154,7 @@ in
 
       ETHInterface = {
         bind = mkOption {
+          type = types.str;
           default = "";
           example = "eth0";
           description =
@@ -212,7 +213,7 @@ in
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
 
-      preStart = if cfg.confFile != "" then "" else ''
+      preStart = if cfg.confFile != null then "" else ''
         [ -e /etc/cjdns.keys ] && source /etc/cjdns.keys
 
         if [ -z "$CJDNS_PRIVATE_KEY" ]; then
@@ -234,7 +235,7 @@ in
       '';
 
       script = (
-        if cfg.confFile != "" then "${pkg}/bin/cjdroute < ${cfg.confFile}" else
+        if cfg.confFile != null then "${pkg}/bin/cjdroute < ${cfg.confFile}" else
           ''
             source /etc/cjdns.keys
             echo '${cjdrouteConf}' | sed \
@@ -253,7 +254,7 @@ in
     networking.extraHosts = "${cjdnsHosts}";
 
     assertions = [
-      { assertion = ( cfg.ETHInterface.bind != "" || cfg.UDPInterface.bind != "" || cfg.confFile != "" );
+      { assertion = ( cfg.ETHInterface.bind != "" || cfg.UDPInterface.bind != "" || cfg.confFile != null );
         message = "Neither cjdns.ETHInterface.bind nor cjdns.UDPInterface.bind defined.";
       }
       { assertion = config.networking.enableIPv6;

From e94bd6f31dc6b551b28b479a992564d837e28b95 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 25 Oct 2016 19:52:58 +0200
Subject: [PATCH 37/87] cjdns service: protect /home and /tmp

---
 nixos/modules/services/networking/cjdns.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix
index c0955811e54..64d9ec215e4 100644
--- a/nixos/modules/services/networking/cjdns.nix
+++ b/nixos/modules/services/networking/cjdns.nix
@@ -248,6 +248,9 @@ in
       serviceConfig = {
         Type = "forking";
         Restart = "on-failure";
+
+        ProtectHome = true;
+        PrivateTmp = true;
       };
     };
 

From 9654e09b5a4bd44ecf16f8c435afa834a76ef2b1 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 24 Oct 2016 20:33:34 +0200
Subject: [PATCH 38/87] cjdns service: ensure that generated passwd has
 requested length

`head -cNUM ... | tr -dc SET` might generate output containing fewer
than NUM characters.  Given the limited alphabet, this could result in a
fairly weak passphrase. The construction `tr </dev/urandom | head
-cNUM`, however, is sure to give us the full `NUM`.
---
 nixos/modules/services/networking/cjdns.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix
index 64d9ec215e4..849d273a41d 100644
--- a/nixos/modules/services/networking/cjdns.nix
+++ b/nixos/modules/services/networking/cjdns.nix
@@ -229,7 +229,7 @@ in
         fi
 
         if [ -z "$CJDNS_ADMIN_PASSWORD" ]; then
-            echo "CJDNS_ADMIN_PASSWORD=$(${pkgs.coreutils}/bin/head -c 96 /dev/urandom | ${pkgs.coreutils}/bin/tr -dc A-Za-z0-9)" \
+            echo "CJDNS_ADMIN_PASSWORD=$(tr -dc A-Za-z0-9 </dev/urandom | head -c 96)" \
                 >> /etc/cjdns.keys
         fi
       '';

From 8180922d236c53b5e09cfe1b63f6c12977bb2803 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 25 Oct 2016 20:56:54 +0200
Subject: [PATCH 39/87] cjdns service: refactor cjdns hosts builder

The old version would export two lists to a bash builder and do pairwise
processing on the bash side.  In the new version we instead generate a
logic free builder on the Nix side. This is not only conceptually
simpler but reduces the amount of code and intermediate values.
---
 .../services/networking/cjdns-hosts.sh        | 11 -------
 nixos/modules/services/networking/cjdns.nix   | 29 +++++++++----------
 2 files changed, 13 insertions(+), 27 deletions(-)
 delete mode 100644 nixos/modules/services/networking/cjdns-hosts.sh

diff --git a/nixos/modules/services/networking/cjdns-hosts.sh b/nixos/modules/services/networking/cjdns-hosts.sh
deleted file mode 100644
index 8a2b47e5214..00000000000
--- a/nixos/modules/services/networking/cjdns-hosts.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-pubs=($pubs)
-hosts=($hosts)
-
-lines="''\n"
-for ((i = 0; i < ${#pubs[*]}; i++)); do
-    addr=$($cjdns/bin/publictoip6 ${pubs[i]})
-    lines="${lines}$addr ${hosts[i]}\n"
-done
-lines="${lines}''"
-
-echo -ne $lines > $out
diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix
index 849d273a41d..5e15e40ea0c 100644
--- a/nixos/modules/services/networking/cjdns.nix
+++ b/nixos/modules/services/networking/cjdns.nix
@@ -28,21 +28,18 @@ let
     };
   };
 
-  peers = mapAttrsToList (n: v: v) (cfg.ETHInterface.connectTo // cfg.UDPInterface.connectTo);
-
-  pubs  = toString (map (p: if p.hostname == "" then "" else p.publicKey) peers);
-  hosts = toString (map (p: if p.hostname == "" then "" else p.hostname)  peers);
-
-  cjdnsHosts =
-    if hosts != "" then
-      import (pkgs.stdenv.mkDerivation {
-        name = "cjdns-hosts";
-        builder = ./cjdns-hosts.sh;
-
-        inherit (pkgs) cjdns;
-        inherit pubs hosts;
-      })
-    else "";
+  # Additional /etc/hosts entries for peers with an associated hostname
+  cjdnsExtraHosts = import (pkgs.runCommand "cjdns-hosts" {}
+    # Generate a builder that produces an output usable as a Nix string value
+    ''
+      exec >$out
+      echo \'\'
+      ${concatStringsSep "\n" (mapAttrsToList (k: v:
+          optionalString (v.hostname != "")
+            "echo $(${pkgs.cjdns}/bin/publictoip6 ${x.key}) ${x.host}")
+          (cfg.ETHInterface.connectTo // cfg.UDPInterface.connectTo))}
+      echo \'\'
+    '');
 
   parseModules = x:
     x // { connectTo = mapAttrs (name: value: { inherit (value) password publicKey; }) x.connectTo; };
@@ -254,7 +251,7 @@ in
       };
     };
 
-    networking.extraHosts = "${cjdnsHosts}";
+    networking.extraHosts = cjdnsExtraHosts;
 
     assertions = [
       { assertion = ( cfg.ETHInterface.bind != "" || cfg.UDPInterface.bind != "" || cfg.confFile != null );

From 9c8f6fb4fb448f9f99ef45e13db23ae406cf318c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertugrul=20S=C3=B6ylemez?= <esz@posteo.de>
Date: Thu, 27 Oct 2016 13:41:24 +0200
Subject: [PATCH 40/87] pari-unstable: 2.8.0 -> 2.8.1, "alpha" -> "unstable".

---
 .../science/math/pari/{alpha.nix => unstable.nix}         | 8 ++++----
 pkgs/top-level/all-packages.nix                           | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename pkgs/applications/science/math/pari/{alpha.nix => unstable.nix} (76%)

diff --git a/pkgs/applications/science/math/pari/alpha.nix b/pkgs/applications/science/math/pari/unstable.nix
similarity index 76%
rename from pkgs/applications/science/math/pari/alpha.nix
rename to pkgs/applications/science/math/pari/unstable.nix
index 2f94d636037..2c1cc7d75d8 100644
--- a/pkgs/applications/science/math/pari/alpha.nix
+++ b/pkgs/applications/science/math/pari/unstable.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, gmp, readline, perl }:
 
 stdenv.mkDerivation rec {
-  version = "2.8.0.alpha";
-  name = "pari-${version}";
+  version = "2.8.1.beta";
+  name = "pari-unstable-${version}";
 
   src = fetchurl {
-    url = "http://pari.math.u-bordeaux.fr/pub/pari/testing/${name}.tar.gz";
-    sha256 = "1nrjybrqv55p669rmlkghb940hzf63vnpn34sbwhy9zlbw3hg305";
+    url = "http://pari.math.u-bordeaux.fr/pub/pari/unstable/pari-${version}.tar.gz";
+    sha256 = "167dcqrqsblqrd7z5pb8jrs9xqm8138mik0s4ihlqcq6c3wndhv1";
   };
 
   buildInputs = [gmp readline];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 048cbfb5181..1c65f9bbffd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16692,7 +16692,7 @@ in
   wxmaxima = callPackage ../applications/science/math/wxmaxima { wxGTK = wxGTK30; };
 
   pari = callPackage ../applications/science/math/pari {};
-  pari_alpha = callPackage ../applications/science/math/pari/alpha.nix {};
+  pari-unstable = callPackage ../applications/science/math/pari/unstable.nix {};
 
   ratpoints = callPackage ../applications/science/math/ratpoints {};
 

From dfdaea12403b31983cbfea365c76c29d4934f11e Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 27 Oct 2016 15:03:11 +0200
Subject: [PATCH 41/87] grsecurity: 4.7.10-201610222037 -> 201610262029

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

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 47c77f65093..11f07f13345 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -87,8 +87,8 @@ rec {
 
   grsecurity_testing = grsecPatch
     { kver   = "4.7.10";
-      grrev  = "201610222037";
-      sha256 = "14zp8gsjgzp97mb479s27zzs2ya68dy1pb5izqqvp83xrx16rayc";
+      grrev  = "201610262029";
+      sha256 = "0bczfyb0zazccl9d8sxm4p34nayamyiv7c1hp272glcjjmvlb7cv";
     };
 
   # This patch relaxes grsec constraints on the location of usermode helpers,

From a5c1985fef381b1fb5d75d3b4028ed5b5d4454b3 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 26 Oct 2016 20:00:33 -0400
Subject: [PATCH 42/87] busybox: 1.24.2 -> 1.25.1

---
 .../linux/busybox/busybox-in-store.patch        | 17 ++++++++---------
 pkgs/os-specific/linux/busybox/default.nix      |  4 ++--
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/pkgs/os-specific/linux/busybox/busybox-in-store.patch b/pkgs/os-specific/linux/busybox/busybox-in-store.patch
index ab072efd930..3500f167a14 100644
--- a/pkgs/os-specific/linux/busybox/busybox-in-store.patch
+++ b/pkgs/os-specific/linux/busybox/busybox-in-store.patch
@@ -1,15 +1,14 @@
 Allow BusyBox to be invoked as "<something>-busybox". This is
 necessary when it's run from the Nix store as <hash>-busybox during
 stdenv bootstrap.
-
---- busybox-1.24.2-orig/libbb/appletlib.c	2016-03-17 21:35:49.000000000 +0100
-+++ busybox-1.24.2/libbb/appletlib.c	2016-09-25 08:48:18.293104041 +0200
-@@ -779,7 +779,7 @@
- 	int applet = find_applet_by_name(name);
- 	if (applet >= 0)
- 		run_applet_no_and_exit(applet, argv);
+--- busybox-1.25.1-orig/libbb/appletlib.orig	2016-10-26 19:54:20.510957575 -0400
++++ busybox-1.25.1/libbb/appletlib.c	2016-10-26 19:48:31.590862853 -0400
+@@ -884,7 +884,7 @@
+ 	int applet;
+ 
+ # if ENABLE_BUSYBOX
 -	if (is_prefixed_with(name, "busybox"))
 +	if (strstr(name, "busybox") != 0)
  		exit(busybox_main(argv));
- }
- 
+ # endif
+ 	/* find_applet_by_name() search is more expensive, so goes second */
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index 2563c442822..6f86529a265 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -26,11 +26,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "busybox-1.24.2";
+  name = "busybox-1.25.1";
 
   src = fetchurl {
     url = "http://busybox.net/downloads/${name}.tar.bz2";
-    sha256 = "0mf8f6ly8yi1fbr15jkyv6hxwh2x800x661rcd11rwsnqqzga7p7";
+    sha256 = "0bm0l8xdjdz3kdyajp8wg27yamsw7r2y88nnrxwvvz984c7pwri7";
   };
 
   hardeningDisable = [ "format" ] ++ lib.optional enableStatic [ "fortify" ];

From 4383a45fa56ec6c3335b978085c8ee436dfb1ac1 Mon Sep 17 00:00:00 2001
From: Igor Sharonov <igsha@users.noreply.github.com>
Date: Thu, 27 Oct 2016 19:03:56 +0300
Subject: [PATCH 43/87] pythonPackages.fasteners: 0.13.0 -> 0.14.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6fcd44dac0b..6953704df7b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17109,11 +17109,11 @@ in modules // {
 
   fasteners = buildPythonPackage rec {
     name = "fasteners-${version}";
-    version = "0.13.0";
+    version = "0.14.1";
 
     src = pkgs.fetchurl {
-      url = "mirror://pypi/f/fasteners/fasteners-0.13.0.tar.gz";
-      sha256 = "0nghdq3zihiqg10dp76ls7yn44m5wjncyz7fk8isagkrspkh9a3n";
+      url = "mirror://pypi/f/fasteners/${name}.tar.gz";
+      sha256 = "063y20kx01ihbz2mziapmjxi2cd0dq48jzg587xdsdp07xvpcz22";
     };
 
     propagatedBuildInputs = with self; [ six monotonic testtools ];

From 3e648d1ec6ab2aaf4a57f56fc10fe8e8c3b48e3f Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 27 Oct 2016 16:56:34 +0100
Subject: [PATCH 44/87] pythonPackages.awscli: 1.10.51 -> 1.11.10

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 228747f6a21..a4ba5875d0b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1452,13 +1452,13 @@ in {
 
   awscli = buildPythonPackage rec {
     name = "awscli-${version}";
-    version = "1.10.51";
+    version = "1.11.10";
 
     namePrefix = "";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/a/awscli/${name}.tar.gz";
-      sha256 = "19n7r6fwnwpi0cyrqh20w80mrcj0b6j3if5p58hi1k3fdp60nscq";
+      sha256 = "174lfpai5cga1ml2bwswjil6h544m57js9ki7hqkr9gdbpa8pyrk";
     };
 
     # No tests included
@@ -2978,12 +2978,12 @@ in {
   };
 
   botocore = buildPythonPackage rec {
-    version = "1.4.41"; # This version is required by awscli
+    version = "1.4.67"; # This version is required by awscli
     name = "botocore-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/b/botocore/${name}.tar.gz";
-      sha256 = "0c3abr2rxiilqklika8x360pr0mgx7hlhbhj8w72izs2r6ww4dys";
+      sha256 = "15fh3ng33mcbhm76pk9qqglf342qj471gfcqxv0nrl9f8sn3v60q";
     };
 
     propagatedBuildInputs =
@@ -5630,11 +5630,11 @@ in {
 
   dateutil = buildPythonPackage (rec {
     name = "dateutil-${version}";
-    version = "2.4.2";
+    version = "2.5.3";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/p/python-dateutil/python-${name}.tar.gz";
-      sha256 = "3e95445c1db500a344079a47b171c45ef18f57d188dffdb0e4165c71bea8eb3d";
+      sha256 = "1v9j9fmf8g911yg6k01xa2db6dx3wv73zkk7fncsj7vagjqgs20l";
     };
 
     propagatedBuildInputs = with self; [ self.six ];
@@ -12888,11 +12888,11 @@ in {
   };
 
   jmespath = buildPythonPackage rec {
-    name = "jmespath-0.7.1";
+    name = "jmespath-0.9.0";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/j/jmespath/${name}.tar.gz";
-      sha256 = "1lazbx65imassd7h24z49za001rvx1lmx8r0l21h4izs7pp14nnd";
+      sha256 = "0g9xvl69y7nr3w7ag4fsp6sm4fqf6vrqjw7504x2hzrrsh3ampq8";
     };
 
     buildInputs = with self; [ nose ];
@@ -22344,12 +22344,12 @@ in {
   };
 
   s3transfer = buildPythonPackage rec {
-    version = "0.0.1"; # This version is required by awscli
+    version = "0.1.9";
     name = "s3transfer-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/s/s3transfer/${name}.tar.gz";
-      sha256 = "0ma31zvv7gy240xgd1zw853lpzkdci6mapzpg3x4vycann6yvf9b";
+      sha256 = "0m67nhdnp2pd11j8h4bgz63zq0mvn2f205vrxmr3my8m45kpvb8p";
     };
 
     foo = 1;

From 8fbe389fab036e816c8d2b74bcac129b650e393e Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 27 Oct 2016 17:29:11 +0100
Subject: [PATCH 45/87] pythonPackages.boto3: 1.3.1 -> 1.4.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a4ba5875d0b..de289d90865 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2941,16 +2941,16 @@ in {
 
   boto3 = buildPythonPackage rec {
     name = "boto3-${version}";
-    version = "1.3.1";
+    version = "1.4.1";
 
     src = pkgs.fetchFromGitHub {
       owner = "boto";
       repo  = "boto3";
       rev   = version;
-      sha256 = "1rbwcslk9dgayrg3vy3m0bqj767hdy1aphy5wjgz925bsydgxdg6";
+      sha256 = "19ij6cs2n3p5fgipbrq1dybq2sjjvlhg9n5a5sv9wi95x9wqi5wb";
     };
 
-    propagatedBuildInputs = [ self.botocore self.jmespath ] ++
+    propagatedBuildInputs = [ self.botocore self.jmespath self.s3transfer ] ++
                             (if isPy3k then [] else [self.futures]);
     buildInputs = [ self.docutils self.nose self.mock ];
     checkPhase = ''

From 282532e702ae18b397b90c14920c9952adb1b18d Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 27 Oct 2016 12:46:04 -0400
Subject: [PATCH 46/87] docker: 1.12.2 -> 1.12.3

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

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 90d57601e80..921558a2d12 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -11,13 +11,13 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "docker-${version}";
-  version = "1.12.2";
+  version = "1.12.3";
 
   src = fetchFromGitHub {
     owner = "docker";
     repo = "docker";
     rev = "v${version}";
-    sha256 = "01smz3j55p12z5gkpl945sw49g7aqkxacrlzrlm5px9158z1j74p";
+    sha256 = "0jifd35h22lgh36w1j2k97pgndjh5sppr3cwndlv0saf9618wx5k";
   };
 
   buildInputs = [

From b846d5198e703ce5ff28c819314148ccedaf2609 Mon Sep 17 00:00:00 2001
From: Igor Sharonov <igsha@users.noreply.github.com>
Date: Thu, 27 Oct 2016 19:59:28 +0300
Subject: [PATCH 47/87] pythonPackages.passlib: 1.6.2 -> 1.6.5

---
 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 6fcd44dac0b..174e274f8d7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8144,12 +8144,12 @@ in modules // {
   };
 
   passlib = buildPythonPackage rec {
-    version = "1.6.2";
+    version = "1.6.5";
     name    = "passlib-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/p/passlib/passlib-${version}.tar.gz";
-      sha256 = "e987f6000d16272f75314c7147eb015727e8532a3b747b1a8fb58e154c68392d";
+      sha256 = "1z27wdxs5rj5xhhqfzvzn3yg682irkxw6dcs5jj7mcf97psk8gd8";
     };
 
     buildInputs = with self; [ nose pybcrypt];

From f4fdec3fc0b3d9fe9a31cf79a3036a93632a77fb Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Thu, 27 Oct 2016 11:04:38 -0700
Subject: [PATCH 48/87] Delete guile-2-test.nix, grep says its dead code

---
 pkgs/top-level/guile-2-test.nix | 84 ---------------------------------
 1 file changed, 84 deletions(-)
 delete mode 100644 pkgs/top-level/guile-2-test.nix

diff --git a/pkgs/top-level/guile-2-test.nix b/pkgs/top-level/guile-2-test.nix
deleted file mode 100644
index 9d2fbcbef5c..00000000000
--- a/pkgs/top-level/guile-2-test.nix
+++ /dev/null
@@ -1,84 +0,0 @@
-/* A Hydra jobset to test Guile-using applications and libraries with the
-   Guile 2.x pre-releases.
-
-   -- ludo@gnu.org  */
-
-let
-  allPackages = import ../..;
-
-  pkgsFun = { system ? builtins.currentSystem }:
-    allPackages {
-      inherit system;
-      config.packageOverrides = pkgs: {
-        guile = pkgs.guile_2_0;
-      };
-    };
-
-  pkgs = pkgsFun {};
-
-  toJob = x: if builtins.isAttrs x then x else
-    { type = "job"; systems = x; schedulingPriority = 10; };
-
-  /* Perform a job on the given set of platforms.  The function `f' is
-     called by Hydra for each platform, and should return some job
-     to build on that platform.  `f' is passed the Nixpkgs collection
-     for the platform in question. */
-  testOn = systems: f: {system ? builtins.currentSystem}:
-    if pkgs.lib.elem system systems
-    then f (pkgsFun {inherit system;})
-    else {};
-
-  /* Map an attribute of the form `foo = [platforms...]'  to `testOn
-     [platforms...] (pkgs: pkgs.foo)'. */
-  mapTestOn = pkgs.lib.mapAttrsRecursiveCond
-    (as: !(as ? type && as.type == "job"))
-    (path: value:
-      let
-        job = toJob value;
-        getPkg = pkgs:
-          pkgs.lib.addMetaAttrs { schedulingPriority = toString job.schedulingPriority; }
-          (pkgs.lib.getAttrFromPath path pkgs);
-      in testOn job.systems getPkg);
-
-  inherit (pkgs.lib.platforms) linux darwin cygwin allBut all;
-
-in (mapTestOn {
-  /* The package list below was obtained with:
-
-     cat top-level/all-packages.nix                             \
-     | grep -B3 'guile[^=]*$'                                   \
-     | grep '^[[:blank:]]*[a-zA-Z0-9_]\+[[:blank:]]*='          \
-     | sed -es'/^[[:blank:]]*\(.\+\)[[:blank:]]*=.*$/\1= linux;/g'
-
-     with some minor edits.
-   */
-
-  guile = linux;
-
-  autogen = linux;
-  lsh = linux;
-  mailutils = linux;
-  mcron = linux;
-  texmacs = linux;
-  guileCairo = linux;
-  guileGnome = linux;
-  guile_lib = linux;
-  guileLint = linux;
-  guile_ncurses = linux;
-  gwrap = linux;
-  swig = linux;
-  gnutls = linux;
-  slibGuile = linux;
-  dico = linux;
-  trackballs = linux;
-  beast = linux;
-  elinks = linux;
-  gnucash = linux;
-  gnunet = linux;
-  snd = linux;
-  ballAndPaddle = linux;
-  drgeo = linux;
-  lilypond = linux;
-  liquidwar = linux;
-  freetalk = linux;
-})

From c60b3e4bfc94c567db5d68eaaf6c8c1bbb9d43ee Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Thu, 27 Oct 2016 15:10:39 -0700
Subject: [PATCH 49/87] haskellPackages.hakyll: Fix the Darwin build (broken
 tests)

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 3b8a93f2108..3864a190fc8 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -167,6 +167,13 @@ self: super: {
     then addBuildDepend super.halive pkgs.darwin.apple_sdk.frameworks.AppKit
     else super.halive;
 
+  # Hakyll's tests are broken on Darwin (3 failures); and they require util-linux
+  hakyll = if pkgs.stdenv.isDarwin
+    then dontCheck (overrideCabal super.hakyll (drv: {
+      testToolDepends = [];
+    }))
+    else super.hakyll;
+
   # 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;

From 3cb116f708896b2c33f5cc3a4a925fd6a762dfa0 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Thu, 27 Oct 2016 20:28:12 -0700
Subject: [PATCH 50/87] qt48: fix eval

---
 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 1c65f9bbffd..9ad9515b98b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8834,7 +8834,7 @@ in
   qt48 = callPackage ../development/libraries/qt-4.x/4.8 {
     # GNOME dependencies are not used unless gtkStyle == true
     mesa = mesa_noglu;
-    inherit (pkgs.gnome) libgnomeui GConf gnome_vfs;
+    inherit (pkgs.gnome2) libgnomeui GConf gnome_vfs;
     cups = if stdenv.isLinux then cups else null;
 
     # XXX: mariadb doesn't built on fbsd as of nov 2015

From d9bc6eb7f01af72fb5e9c6d9fb0189684728fef7 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Tue, 26 Apr 2016 21:18:46 -0700
Subject: [PATCH 51/87] top-level: Make `stdenv/default.nix` more concise with
 `inherit (expr) id;` syntax

---
 pkgs/stdenv/default.nix        | 10 ++++------
 pkgs/stdenv/native/default.nix |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix
index 96f07ae9fc6..3035d87e1fc 100644
--- a/pkgs/stdenv/default.nix
+++ b/pkgs/stdenv/default.nix
@@ -16,9 +16,7 @@ rec {
   # i.e., the stuff in /bin, /usr/bin, etc.  This environment should
   # be used with care, since many Nix packages will not build properly
   # with it (e.g., because they require GNU Make).
-  stdenvNative = (import ./native {
-    inherit system allPackages config;
-  }).stdenv;
+  inherit (import ./native { inherit system allPackages config; }) stdenvNative;
 
   stdenvNativePkgs = allPackages {
     bootStdenv = stdenvNative;
@@ -33,12 +31,12 @@ rec {
     pkgs = stdenvNativePkgs;
   };
 
-  stdenvFreeBSD = (import ./freebsd { inherit system allPackages platform config; }).stdenvFreeBSD;
+  inherit (import ./freebsd { inherit system allPackages platform config; }) stdenvFreeBSD;
 
   # Linux standard environment.
-  stdenvLinux = (import ./linux { inherit system allPackages platform config lib; }).stdenvLinux;
+  inherit (import ./linux { inherit system allPackages platform config lib; }) stdenvLinux;
 
-  stdenvDarwin = (import ./darwin { inherit system allPackages platform config;}).stdenvDarwin;
+  inherit (import ./darwin { inherit system allPackages platform config;}) stdenvDarwin;
 
   # Select the appropriate stdenv for the platform `system'.
   stdenv =
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index 291ef5a5079..fcd0805275b 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -141,5 +141,5 @@ rec {
   };
 
 
-  stdenv = stdenvBoot2;
+  stdenvNative = stdenvBoot2;
 }

From 8e319c5ddac707fb4cb3315f9eadea9a70fc8c84 Mon Sep 17 00:00:00 2001
From: Tim Digel <tim.digel@active-group.de>
Date: Thu, 6 Oct 2016 09:51:21 +0200
Subject: [PATCH 52/87] Add package-option to enable module-support

---
 pkgs/development/libraries/openldap/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index a99cc51de4a..b197236a649 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, cyrus_sasl, db, groff }:
+{ stdenv, fetchurl, openssl, cyrus_sasl, db, groff, libtool }:
 
 stdenv.mkDerivation rec {
   name = "openldap-2.4.44";
@@ -13,11 +13,12 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ openssl cyrus_sasl db groff ];
+  buildInputs = [ openssl cyrus_sasl db groff libtool ];
 
   configureFlags =
     [ "--enable-overlays"
       "--disable-dependency-tracking"   # speeds up one-time build
+      "--enable-modules"
     ] ++ stdenv.lib.optional (openssl == null) "--without-tls"
       ++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl"
       ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic";
@@ -36,6 +37,10 @@ stdenv.mkDerivation rec {
     rm -r libraries/*/.libs
   '';
 
+  postInstall = ''
+    chmod +x $out/lib/*.so
+  '';
+
   meta = with stdenv.lib; {
     homepage    = http://www.openldap.org/;
     description = "An open source implementation of the Lightweight Directory Access Protocol";

From 162c65fc87d8e0fc450d2f95dda3f7b3b91987a2 Mon Sep 17 00:00:00 2001
From: Christine Koppelt <cko@users.noreply.github.com>
Date: Wed, 19 Oct 2016 00:04:20 +0200
Subject: [PATCH 53/87] nodejs-0_10: remove node.js 0.10 reaches end of LTS in
 a few days (see https://github.com/nodejs/LTS for details). Therefore I
 removed it and set 3 dependant packages to broken as they don't build anymore

---
 .../audio/groovebasin/default.nix             |  3 +
 pkgs/development/compilers/opa/default.nix    |  3 +
 pkgs/development/web/nodejs/v0_10.nix         | 75 -------------------
 pkgs/top-level/all-packages.nix               | 23 +-----
 4 files changed, 10 insertions(+), 94 deletions(-)
 delete mode 100644 pkgs/development/web/nodejs/v0_10.nix

diff --git a/pkgs/applications/audio/groovebasin/default.nix b/pkgs/applications/audio/groovebasin/default.nix
index 0bbf2baf105..7eb2e85f7be 100644
--- a/pkgs/applications/audio/groovebasin/default.nix
+++ b/pkgs/applications/audio/groovebasin/default.nix
@@ -62,5 +62,8 @@ in nodePackages.buildNodePackage rec {
 
       Groove Basin supports Last.fm scrobbling.
     '';
+    # groovebasin was built with nodejs 0.10 which reached end of LTS
+    # in October 216, it doesn't built with nodejs 4.x
+    broken = true;
   };
 }
diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix
index 2e691dc749d..a6969477844 100644
--- a/pkgs/development/compilers/opa/default.nix
+++ b/pkgs/development/compilers/opa/default.nix
@@ -63,5 +63,8 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl3;
     maintainers = [ stdenv.lib.maintainers.kkallio ];
     platforms = with stdenv.lib.platforms; linux;
+    # opa was built with nodejs 0.10 which reached end of LTS
+    # in October 216, it doesn't built with nodejs 4.x
+    broken = true;
   };
 }
diff --git a/pkgs/development/web/nodejs/v0_10.nix b/pkgs/development/web/nodejs/v0_10.nix
deleted file mode 100644
index cdb73e19232..00000000000
--- a/pkgs/development/web/nodejs/v0_10.nix
+++ /dev/null
@@ -1,75 +0,0 @@
-{ stdenv, lib, fetchurl, openssl, python2, zlib, v8, utillinux, http-parser, c-ares
-, pkgconfig, runCommand, which, libtool
-
-# apple frameworks
-, CoreServices, ApplicationServices, Carbon, Foundation
-}:
-
-let
-  version = "0.10.42";
-
-  # !!! Should we also do shared libuv?
-  deps = {
-    inherit openssl zlib;
-
-    # disabled system v8 because v8 3.14 no longer receives security fixes
-    # we fall back to nodejs' internal v8 copy which receives backports for now
-    # inherit v8
-  } // (stdenv.lib.optionalAttrs (!stdenv.isDarwin) {
-    inherit http-parser;
-  })
-  // ({ cares = c-ares; });
-
-  sharedConfigureFlags = name: let drv = builtins.getAttr name deps; in [
-    "--shared-${name}"
-    "--shared-${name}-includes=${lib.getDev drv}/include"
-    "--shared-${name}-libpath=${lib.getLib drv}/lib"
-  ];
-
-  inherit (stdenv.lib) concatMap optional optionals maintainers licenses platforms;
-in stdenv.mkDerivation {
-  name = "nodejs-${version}";
-
-  src = fetchurl {
-    url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
-    sha256 = "01g19mq8b3b828f59x7bv79973w5sw4133ll1dxml37qk0vdbhgb";
-  };
-
-  configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++
-    stdenv.lib.optional stdenv.isDarwin "--without-dtrace";
-
-  prePatch = ''
-    patchShebangs .
-    sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py
-    sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' tools/gyp/pylib/gyp/xcode_emulation.py
-  '';
-
-  patches = stdenv.lib.optionals stdenv.isDarwin [ ./default-arch.patch ./no-xcode.patch ];
-
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
-    (cd tools/gyp; patch -Np1 -i ${../../python-modules/gyp/no-darwin-cflags.patch})
-  '';
-
-  buildInputs = [ python2 which ]
-    ++ (optional stdenv.isLinux utillinux)
-    ++ optionals stdenv.isDarwin [ pkgconfig openssl libtool CoreServices ApplicationServices Foundation ];
-  propagatedBuildInputs = optionals stdenv.isDarwin [ Carbon ];
-  setupHook = ./setup-hook.sh;
-
-  enableParallelBuilding = true;
-
-  postFixup = ''
-    pushd $out/lib/node_modules/npm/node_modules/node-gyp
-    patch -p2 < ${./no-xcode.patch}
-    popd
-  '';
-
-  passthru.interpreterName = "nodejs-0.10";
-
-  meta = {
-    description = "Event-driven I/O framework for the V8 JavaScript engine";
-    homepage = http://nodejs.org;
-    license = licenses.mit;
-    platforms = platforms.linux ++ platforms.darwin;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9ad9515b98b..62727cf83b1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2413,11 +2413,6 @@ in
 
   ninka = callPackage ../development/tools/misc/ninka { };
 
-  nodejs-0_10 = callPackage ../development/web/nodejs/v0_10.nix {
-    libtool = darwin.cctools;
-    inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices Carbon Foundation;
-  };
-
   nodejs-4_x = callPackage ../development/web/nodejs/v4.nix {
     libtool = darwin.cctools;
   };
@@ -2426,10 +2421,7 @@ in
     libtool = darwin.cctools;
   };
 
-  nodejs = if stdenv.system == "armv5tel-linux" then
-    nodejs-0_10
-  else
-    nodejs-4_x;
+  nodejs = nodejs-4_x;
 
   nodePackages_6_x = callPackage ../development/node-packages/default-v6.nix {
     nodejs = pkgs.nodejs-6_x;
@@ -2439,14 +2431,7 @@ in
     nodejs = pkgs.nodejs-4_x;
   };
 
-  nodePackages_0_10 = callPackage ../development/node-packages/default-v0_10.nix {
-    nodejs = pkgs.nodejs-0_10;
-  };
-
-  nodePackages = if stdenv.system == "armv5tel-linux" then
-    nodePackages_0_10
-  else
-    nodePackages_4_x;
+  nodePackages = nodePackages_4_x;
 
   # Can be used as a user shell
   nologin = shadow;
@@ -5092,7 +5077,7 @@ in
   inherit (ocamlPackages) ocaml-top;
 
   opa = callPackage ../development/compilers/opa {
-    nodejs = nodejs-0_10;
+    nodejs = nodejs-4_x;
   };
 
   inherit (ocaml-ng.ocamlPackages_4_01_0) opam_1_0_0;
@@ -10002,7 +9987,7 @@ in
 
   grafana = callPackage ../servers/monitoring/grafana { };
 
-  groovebasin = callPackage ../applications/audio/groovebasin { nodejs = nodejs-0_10; };
+  groovebasin = callPackage ../applications/audio/groovebasin { nodejs = nodejs-4_x; };
 
   haka = callPackage ../tools/security/haka { };
 

From a1ecc5648a5b083b9169e2f9e99dcdb5fa4b32e5 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 28 Oct 2016 16:27:10 +0200
Subject: [PATCH 54/87] nixpkgs doc: fix build

Ref e4cd45a30c92a19a240df835cdaf6da5f76ea9fc
---
 doc/functions.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/functions.xml b/doc/functions.xml
index e767d01d843..e3a6975f91f 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -57,7 +57,7 @@ in ...</programlisting>
     linkend="sec-modify-via-packageOverrides">config.packageOverrides</link>,
     along with that from previous calls if this function was called repeatedly.
     Now those previous changes will be preserved so this function can be "chained" meaningfully.
-    To recover the old behavior, make sure <varname>config.packageOverrides<varname> is unset,
+    To recover the old behavior, make sure <varname>config.packageOverrides</varname> is unset,
     and call this only once off a "freshly" imported nixpkgs:
 
     <programlisting>let

From 620b364a874ec246168851b87f802330fe47e7ac Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 28 Oct 2016 16:09:57 +0200
Subject: [PATCH 55/87] haskellPackages.wai-app-file-cgi: fix build

Fixes https://github.com/NixOS/nixpkgs/issues/19611
Fixes https://github.com/NixOS/nixpkgs/issues/19612
---
 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 3864a190fc8..8274365a952 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -463,7 +463,6 @@ self: super: {
   translatable-intset = dontCheck super.translatable-intset;
   ua-parser = dontCheck super.ua-parser;
   unagi-chan = dontCheck super.unagi-chan;
-  wai-app-file-cgi = dontCheck super.wai-app-file-cgi;
   wai-logger = dontCheck super.wai-logger;
   WebBits = dontCheck super.WebBits;                    # http://hydra.cryp.to/build/499604/log/raw
   webdriver = dontCheck super.webdriver;
@@ -1031,4 +1030,11 @@ self: super: {
   # https://github.com/vshabanov/HsOpenSSL/issues/11
   HsOpenSSL = doJailbreak super.HsOpenSSL;
 
+  # https://github.com/NixOS/nixpkgs/issues/19612
+  wai-app-file-cgi = (dontCheck super.wai-app-file-cgi).overrideScope (self: super: {
+    http-client = self.http-client_0_5_3_2;
+    http-client-tls = self.http-client-tls_0_3_3;
+    http-conduit = self.http-conduit_2_2_3;
+  });
+
 }

From 00659b83a3a6332d8f7d0f2d5b461a5d70668e63 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Oct 2016 17:56:36 +0200
Subject: [PATCH 56/87] LTS Haskell 7.5

(cherry picked from commit a6445ace6f978d865eaeb1683709eb28d9d1f5c7)
---
 .../configuration-hackage2nix.yaml            | 64 +++++++++----------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 82a2ddc57fa..2e89521fca8 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -32,7 +32,7 @@ core-packages:
   - xhtml-3000.2.1
 
 default-package-overrides:
-  # LTS Haskell 7.4
+  # LTS Haskell 7.5
   - abstract-deque ==0.3
   - abstract-par ==0.3.3
   - AC-Vector ==2.3.2
@@ -138,7 +138,7 @@ default-package-overrides:
   - ansi-wl-pprint ==0.6.7.3
   - ansigraph ==0.2.0.0
   - api-field-json-th ==0.1.0.1
-  - app-settings ==0.2.0.8
+  - app-settings ==0.2.0.9
   - appar ==0.1.4
   - apply-refact ==0.3.0.0
   - arbtt ==0.9.0.10
@@ -179,7 +179,7 @@ default-package-overrides:
   - base64-bytestring ==1.0.0.1
   - base64-string ==0.2
   - basic-prelude ==0.6.1
-  - bcrypt ==0.0.9
+  - bcrypt ==0.0.10
   - benchpress ==0.2.2.8
   - bencode ==0.6.0.0
   - bento ==0.1.0
@@ -192,7 +192,7 @@ default-package-overrides:
   - binary-orphans ==0.1.5.1
   - binary-parser ==0.5.2
   - binary-search ==1.0.0.3
-  - binary-tagged ==0.1.4.0
+  - binary-tagged ==0.1.4.1
   - binary-typed ==1.0
   - bindings-DSL ==1.0.23
   - bindings-GLFW ==3.1.2.2
@@ -305,8 +305,8 @@ default-package-overrides:
   - circle-packing ==0.1.0.5
   - clash-lib ==0.6.21
   - clash-prelude ==0.10.14
-  - clash-systemverilog ==0.6.9
-  - clash-verilog ==0.6.9
+  - clash-systemverilog ==0.6.10
+  - clash-verilog ==0.6.10
   - clash-vhdl ==0.6.16
   - classy-prelude ==1.0.0.2
   - classy-prelude-conduit ==1.0.0
@@ -428,7 +428,7 @@ default-package-overrides:
   - dependent-sum ==0.3.2.2
   - dependent-sum-template ==0.0.0.5
   - derive ==2.5.26
-  - deriving-compat ==0.3.3
+  - deriving-compat ==0.3.4
   - descriptive ==0.9.4
   - diagrams ==1.3.0.1
   - diagrams-cairo ==1.3.1.1
@@ -461,7 +461,7 @@ default-package-overrides:
   - djinn-lib ==0.0.1.2
   - dlist ==0.8.0.2
   - dlist-instances ==0.1.1.1
-  - dns ==2.0.7
+  - dns ==2.0.8
   - do-list ==1.0.1
   - dockerfile ==0.1.0.1
   - docopt ==0.7.0.4
@@ -469,7 +469,7 @@ default-package-overrides:
   - doctest-discover ==0.1.0.7
   - doctest-prop ==0.2.0.1
   - docvim ==0.3.2.1
-  - dotenv ==0.3.0.3
+  - dotenv ==0.3.1.0
   - dotnet-timespan ==0.0.1.0
   - double-conversion ==2.0.1.0
   - download ==0.3.2.4
@@ -826,7 +826,7 @@ default-package-overrides:
   - heaps ==0.3.3
   - hebrew-time ==0.1.1
   - hedis ==0.9.4
-  - here ==1.2.8
+  - here ==1.2.9
   - heredoc ==0.2.0.0
   - hex ==0.1.2
   - hexstring ==0.11.1
@@ -844,7 +844,7 @@ default-package-overrides:
   - histogram-fill ==0.8.4.1
   - hit ==0.6.3
   - hjsmin ==0.2.0.2
-  - hjsonpointer ==1.0.0.1
+  - hjsonpointer ==1.0.0.2
   - hjsonschema ==1.1.0.1
   - hledger ==0.27.1
   - hledger-interest ==1.4.4
@@ -892,13 +892,13 @@ default-package-overrides:
   - hsemail ==1.7.7
   - HSet ==0.0.0
   - hset ==2.2.0
-  - hsexif ==0.6.0.9
+  - hsexif ==0.6.0.10
   - hsignal ==0.2.7.4
   - hslogger ==1.2.10
   - hslua ==0.4.1
   - hsndfile ==0.8.0
   - hsndfile-vector ==0.5.2
-  - HsOpenSSL ==0.11.3.1
+  - HsOpenSSL ==0.11.3.2
   - HsOpenSSL-x509-system ==0.1.0.3
   - hsp ==0.10.0
   - hspec ==2.2.3
@@ -946,7 +946,7 @@ default-package-overrides:
   - human-readable-duration ==0.2.0.3
   - HUnit ==1.3.1.2
   - HUnit-approx ==1.0
-  - hunit-dejafu ==0.3.0.2
+  - hunit-dejafu ==0.3.0.3
   - hvect ==0.3.1.0
   - hw-bits ==0.1.0.1
   - hw-conduit ==0.0.0.11
@@ -958,12 +958,12 @@ default-package-overrides:
   - hweblib ==0.6.3
   - hworker ==0.1.0.1
   - hworker-ses ==0.1.1.0
-  - hxt ==9.3.1.15
+  - hxt ==9.3.1.16
   - hxt-charproperties ==9.2.0.1
   - hxt-css ==0.1.0.3
   - hxt-http ==9.1.5.2
   - hxt-pickle-utils ==0.1.0.3
-  - hxt-regex-xmlschema ==9.2.0.2
+  - hxt-regex-xmlschema ==9.2.0.3
   - hxt-unicode ==9.0.2.4
   - hybrid-vectors ==0.2.1
   - hyphenation ==0.6
@@ -1004,7 +1004,7 @@ default-package-overrides:
   - io-storage ==0.3
   - io-streams ==1.3.5.0
   - io-streams-haproxy ==1.0.0.1
-  - ip6addr ==0.5.1.3
+  - ip6addr ==0.5.1.4
   - iproute ==1.7.1
   - IPv6Addr ==0.6.1.0
   - irc ==0.6.1.0
@@ -1033,7 +1033,7 @@ default-package-overrides:
   - json-rpc-generic ==0.2.1.2
   - json-schema ==0.7.4.1
   - JuicyPixels ==3.2.8
-  - JuicyPixels-extra ==0.1.0
+  - JuicyPixels-extra ==0.1.1
   - JuicyPixels-scale-dct ==0.1.1.2
   - jwt ==0.7.2
   - kan-extensions ==5.0.1
@@ -1261,7 +1261,7 @@ default-package-overrides:
   - openpgp-asciiarmor ==0.1
   - opensource ==0.1.0.0
   - openssl-streams ==1.2.1.0
-  - operational ==0.2.3.3
+  - operational ==0.2.3.4
   - operational-class ==0.3.0.0
   - opml-conduit ==0.5.0.1
   - optional-args ==1.0.1
@@ -1274,7 +1274,7 @@ default-package-overrides:
   - osdkeys ==0.0
   - overloaded-records ==0.4.2.0
   - package-description-remote ==0.2.0.0
-  - packdeps ==0.4.2.1
+  - packdeps ==0.4.3
   - pager ==0.1.1.0
   - pagerduty ==0.0.7
   - pagination ==0.1.1
@@ -1330,7 +1330,7 @@ default-package-overrides:
   - pipes-cliff ==0.12.0.0
   - pipes-concurrency ==2.0.6
   - pipes-csv ==1.4.3
-  - pipes-extras ==1.0.5
+  - pipes-extras ==1.0.7
   - pipes-fastx ==0.3.0.0
   - pipes-group ==1.0.5
   - pipes-http ==1.0.4
@@ -1411,7 +1411,7 @@ default-package-overrides:
   - quickcheck-assertions ==0.2.0
   - quickcheck-combinators ==0.0.1
   - quickcheck-instances ==0.3.12
-  - quickcheck-io ==0.1.3
+  - quickcheck-io ==0.1.4
   - quickcheck-properties ==0.1
   - quickcheck-simple ==0.1.0.1
   - quickcheck-text ==0.1.2.1
@@ -1436,7 +1436,7 @@ default-package-overrides:
   - readable ==0.3.1
   - ReadArgs ==1.2.2
   - readline ==1.0.3.0
-  - rebase ==1
+  - rebase ==1.0.2.1
   - redis-io ==0.7.0
   - redis-resp ==0.4.0
   - reducers ==3.12.1
@@ -1460,7 +1460,7 @@ default-package-overrides:
   - regex-tdfa ==1.2.2
   - regex-tdfa-text ==1.0.0.3
   - reinterpret-cast ==0.1.0
-  - relational-query ==0.8.3.1
+  - relational-query ==0.8.3.2
   - relational-query-HDBC ==0.6.0.2
   - relational-record ==0.1.5.1
   - relational-schemas ==0.1.3.1
@@ -1536,7 +1536,7 @@ default-package-overrides:
   - servant-mock ==0.8.1.1
   - servant-purescript ==0.3.1.5
   - servant-server ==0.8.1
-  - servant-subscriber ==0.5.0.2
+  - servant-subscriber ==0.5.0.3
   - servant-swagger ==1.1.2
   - servant-swagger-ui ==0.2.0.2.1.5
   - servant-yaml ==0.1.0.0
@@ -1569,7 +1569,7 @@ default-package-overrides:
   - simple-session ==0.10.1.1
   - simple-smt ==0.6.0
   - simple-templates ==0.8.0.1
-  - singleton-bool ==0.1.1.0
+  - singleton-bool ==0.1.2.0
   - singletons ==2.2
   - siphash ==1.0.3
   - skein ==1.0.9.4
@@ -1598,7 +1598,7 @@ default-package-overrides:
   - speculation ==1.5.0.3
   - speedy-slice ==0.1.3
   - sphinx ==0.6.0.1
-  - Spintax ==0.1.0.0
+  - Spintax ==0.1.0.1
   - splice ==0.6.1.1
   - split ==0.2.3.1
   - Spock ==0.11.0.0
@@ -1780,7 +1780,7 @@ default-package-overrides:
   - turtle ==1.2.8
   - turtle-options ==0.1.0.4
   - twitter-conduit ==0.2.1
-  - twitter-feed ==0.2.0.10
+  - twitter-feed ==0.2.0.11
   - twitter-types ==0.7.2.2
   - twitter-types-lens ==0.7.2
   - type-aligned ==0.9.6
@@ -1865,7 +1865,7 @@ default-package-overrides:
   - wai-conduit ==3.0.0.3
   - wai-cors ==0.2.5
   - wai-eventsource ==3.0.0
-  - wai-extra ==3.0.18
+  - wai-extra ==3.0.19
   - wai-logger ==2.3.0
   - wai-middleware-caching ==0.1.0.2
   - wai-middleware-caching-lru ==0.1.0.0
@@ -1904,7 +1904,7 @@ default-package-overrides:
   - weigh ==0.0.3
   - werewolf ==1.5.1.1
   - werewolf-slack ==1.0.2.0
-  - wikicfp-scraper ==0.1.0.4
+  - wikicfp-scraper ==0.1.0.5
   - Win32 ==2.3.1.1
   - Win32-extras ==0.2.0.1
   - Win32-notify ==0.3.0.1
@@ -1952,11 +1952,11 @@ default-package-overrides:
   - xss-sanitize ==0.3.5.7
   - yackage ==0.8.1
   - yahoo-finance-api ==0.1.0.0
-  - yaml ==0.8.18.7
+  - yaml ==0.8.20
   - Yampa ==0.10.5
   - YampaSynth ==0.2
   - yarr ==1.4.0.2
-  - yes-precure5-command ==5.5.2
+  - yes-precure5-command ==5.5.3
   - yesod ==1.4.3
   - yesod-auth ==1.4.13.5
   - yesod-auth-account ==1.4.3

From e0ef9e9714a4c37d24603f8912ef09cea1fcb8fb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Oct 2016 10:08:19 +0200
Subject: [PATCH 57/87] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.0.3 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/bb6bb10d46f914c89e3118e021292d49cf3c3853.
---
 .../haskell-modules/hackage-packages.nix      | 5147 +++++++++++++----
 1 file changed, 4168 insertions(+), 979 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 770fafe59bf..114c40d6179 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1607,6 +1607,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "BitStringRandomMonad" = callPackage
+    ({ mkDerivation, base, bitstring, bytestring, mtl, parallel
+     , primitive, transformers, vector
+     }:
+     mkDerivation {
+       pname = "BitStringRandomMonad";
+       version = "0.1.0.0";
+       sha256 = "70acdb3e821d9fb17190b6bb9882217f31ae44e6d2ddf28f644a8f271156b785";
+       libraryHaskellDepends = [
+         base bitstring bytestring mtl parallel primitive transformers
+         vector
+       ];
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "BitSyntax" = callPackage
     ({ mkDerivation, base, bytestring, QuickCheck, template-haskell }:
      mkDerivation {
@@ -1684,8 +1699,8 @@ self: {
      }:
      mkDerivation {
        pname = "BlogLiterately";
-       version = "0.8.4";
-       sha256 = "1eb44830043ba01ddd186498d594a8b01c1ced908f2ea2dc6aa6085e2c91dd7d";
+       version = "0.8.4.1";
+       sha256 = "58b1f32660e20f13b6b6ce6b0668099a8ed4acc7939468108dcde283d2fe4429";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -1697,7 +1712,7 @@ self: {
        executableHaskellDepends = [ base cmdargs ];
        homepage = "http://byorgey.wordpress.com/blogliterately/";
        description = "A tool for posting Haskelly articles to blogs";
-       license = "GPL";
+       license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -4484,15 +4499,15 @@ self: {
 
   "EntrezHTTP" = callPackage
     ({ mkDerivation, base, biocore, bytestring, conduit, HTTP
-     , http-conduit, hxt, mtl, network, Taxonomy, transformers
+     , http-conduit, hxt, mtl, network, Taxonomy, text, transformers
      }:
      mkDerivation {
        pname = "EntrezHTTP";
-       version = "1.0.1";
-       sha256 = "54461cb1bd772129cc9e5d725ed6997b133bc7725ec1720de511918d07cdc01f";
+       version = "1.0.2";
+       sha256 = "547f087fcc10e85550775bb02c56b9eea6d2cd32d419cdbe0ab33ad28c0335e9";
        libraryHaskellDepends = [
          base biocore bytestring conduit HTTP http-conduit hxt mtl network
-         Taxonomy transformers
+         Taxonomy text transformers
        ];
        homepage = "https://github.com/eggzilla/EntrezHTTP";
        description = "Libary to interface with the NCBI Entrez REST service";
@@ -5068,8 +5083,8 @@ self: {
     ({ mkDerivation, base, hspec }:
      mkDerivation {
        pname = "Files";
-       version = "0.1.1.0";
-       sha256 = "76171c4e0b341ee54297279be1345181e4532ece6455580d03f81900fd33949e";
+       version = "0.1.1.1";
+       sha256 = "9502b3b2b0dd3ea91da652ac616ebba1222882fabe9f540cf79c0e315a435b03";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -6225,6 +6240,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "Grafos" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "Grafos";
+       version = "0.1.0.0";
+       sha256 = "1df102c60f5874fb7afaf4b1ab73663d998165a09628f70711c3fba2afc9f498";
+       libraryHaskellDepends = [ base ];
+       description = "Grafos Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "GrammarProducts" = callPackage
     ({ mkDerivation, ADPfusion, ansi-wl-pprint, base, bytestring
      , containers, data-default, FormalGrammars, lens, newtype, parsers
@@ -8489,17 +8515,18 @@ self: {
 
   "HarmTrace-Base" = callPackage
     ({ mkDerivation, base, binary, containers, ghc-prim, ListLike
-     , QuickCheck, uu-parsinglib
+     , QuickCheck, random, uu-parsinglib
      }:
      mkDerivation {
        pname = "HarmTrace-Base";
-       version = "1.4.0.1";
-       sha256 = "121c6b164587b95b487aad0ff197ae2ff3b4065ee567e3bcdfe7947148018a9c";
+       version = "1.5.3.1";
+       sha256 = "aea6ef3010517315c58508554550bdc05a89b1eee8f077b45f1715835c3e99de";
        libraryHaskellDepends = [
          base binary containers ghc-prim ListLike uu-parsinglib
        ];
        testHaskellDepends = [
-         base binary containers ghc-prim ListLike QuickCheck uu-parsinglib
+         base binary containers ghc-prim ListLike QuickCheck random
+         uu-parsinglib
        ];
        homepage = "https://bitbucket.org/bash/harmtrace-base";
        description = "Parsing and unambiguously representing musical chords";
@@ -9188,6 +9215,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "HsHTSLib" = callPackage
+    ({ mkDerivation, base, bytestring, bytestring-lexing
+     , conduit-combinators, containers, inline-c, mtl, template-haskell
+     }:
+     mkDerivation {
+       pname = "HsHTSLib";
+       version = "1.3.2.0";
+       sha256 = "d54c2cb03b042212b053011011249b24871155c32698cdc53694d618475b5555";
+       libraryHaskellDepends = [
+         base bytestring bytestring-lexing conduit-combinators containers
+         inline-c mtl template-haskell
+       ];
+       description = "High level bindings to htslib";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "HsHaruPDF" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -9233,27 +9276,6 @@ self: {
      }) {Judy = null;};
 
   "HsOpenSSL" = callPackage
-    ({ mkDerivation, base, bytestring, HUnit, integer-gmp, network
-     , openssl, test-framework, test-framework-hunit, time
-     }:
-     mkDerivation {
-       pname = "HsOpenSSL";
-       version = "0.11.3.1";
-       sha256 = "93304b32a09668870843708de9cc94048006e27279f4ceaafe7f5bdcf63047db";
-       libraryHaskellDepends = [
-         base bytestring integer-gmp network time
-       ];
-       librarySystemDepends = [ openssl ];
-       testHaskellDepends = [
-         base bytestring HUnit test-framework test-framework-hunit
-       ];
-       homepage = "https://github.com/vshabanov/HsOpenSSL";
-       description = "Partial OpenSSL binding for Haskell";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) openssl;};
-
-  "HsOpenSSL_0_11_3_2" = callPackage
     ({ mkDerivation, base, bytestring, integer-gmp, network, openssl
      , time
      }:
@@ -9917,20 +9939,6 @@ self: {
      }) {};
 
   "JuicyPixels-extra" = callPackage
-    ({ mkDerivation, base, hspec, JuicyPixels }:
-     mkDerivation {
-       pname = "JuicyPixels-extra";
-       version = "0.1.0";
-       sha256 = "67f7b072929a5cf6bfb95d1b5c0d8f8ea7788cf0801a4d6d2fc2df4271947f84";
-       libraryHaskellDepends = [ base JuicyPixels ];
-       testHaskellDepends = [ base hspec JuicyPixels ];
-       homepage = "https://github.com/mrkkrp/JuicyPixels-extra";
-       description = "Efficiently scale, crop, flip images with JuicyPixels";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "JuicyPixels-extra_0_1_1" = callPackage
     ({ mkDerivation, base, hspec, JuicyPixels }:
      mkDerivation {
        pname = "JuicyPixels-extra";
@@ -10541,15 +10549,16 @@ self: {
      }) {};
 
   "Lazy-Pbkdf2" = callPackage
-    ({ mkDerivation, base, base16-bytestring, binary, bytestring, SHA
+    ({ mkDerivation, base, base16-bytestring, binary, bytestring
+     , cryptonite, memory
      }:
      mkDerivation {
        pname = "Lazy-Pbkdf2";
-       version = "1.0.2";
-       sha256 = "6318c60db0b18877c0edf0a01ba21254b44e9624210bc59834e1dc8116ca86fc";
-       libraryHaskellDepends = [ base binary bytestring SHA ];
+       version = "2.1.0";
+       sha256 = "b431835541f5c22467b58862ffe4fe27a046e215fff8440cd0dbea331a3c7f82";
+       libraryHaskellDepends = [ base binary bytestring ];
        testHaskellDepends = [
-         base base16-bytestring binary bytestring SHA
+         base base16-bytestring binary bytestring cryptonite memory
        ];
        description = "Lazy PBKDF2 generator";
        license = stdenv.lib.licenses.mit;
@@ -12907,8 +12916,8 @@ self: {
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "PPrinter";
-       version = "0.0.4";
-       sha256 = "b3841e572ab3dd8648938b6dbc566c9a7df6aa40f3a3e6d6ea28f267e9a94c04";
+       version = "0.1.0";
+       sha256 = "ec536f3b39f0e1cead0c1309af12bafa2298fe5cc395d7c817cc028275969bb9";
        libraryHaskellDepends = [ base containers ];
        description = "A generic derivable Haskell pretty printer";
        license = stdenv.lib.licenses.bsd3;
@@ -14092,8 +14101,8 @@ self: {
      }:
      mkDerivation {
        pname = "RNAlien";
-       version = "1.1.3";
-       sha256 = "d7d0c3fdbac52be1df3c122a400c3471c6bdeed5e148b742fb77364751029e5d";
+       version = "1.2.5";
+       sha256 = "ab604c7e96b0801d9dc4fa7f30335e918b485dc433efdfb1e56f4c4dc38be6cd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -14105,8 +14114,8 @@ self: {
        ];
        executableHaskellDepends = [
          base biocore biofasta bytestring cassava cmdargs containers
-         directory either-unwrap filepath process random split time vector
-         ViennaRNAParser
+         directory either-unwrap filepath process random split text time
+         vector ViennaRNAParser
        ];
        description = "Unsupervized construction of RNA family models";
        license = stdenv.lib.licenses.gpl3;
@@ -14296,6 +14305,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Rasterific_0_7" = callPackage
+    ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity
+     , free, JuicyPixels, mtl, primitive, transformers, vector
+     , vector-algorithms
+     }:
+     mkDerivation {
+       pname = "Rasterific";
+       version = "0.7";
+       sha256 = "96c466c40237643354cf4aa29cc6694b716009a825e61af8263da96011c7bda1";
+       libraryHaskellDepends = [
+         base bytestring containers dlist FontyFruity free JuicyPixels mtl
+         primitive transformers vector vector-algorithms
+       ];
+       description = "A pure haskell drawing engine";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ReadArgs" = callPackage
     ({ mkDerivation, base, hspec, system-filepath, text }:
      mkDerivation {
@@ -14882,7 +14909,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "SVGFonts_1_6_0_0" = callPackage
+  "SVGFonts_1_6_0_1" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-markup, blaze-svg
      , bytestring, cereal, cereal-vector, containers, data-default-class
      , diagrams-core, diagrams-lib, directory, parsec, split, text
@@ -14890,8 +14917,8 @@ self: {
      }:
      mkDerivation {
        pname = "SVGFonts";
-       version = "1.6.0.0";
-       sha256 = "f83631b05b6acf45b6226c062a6762de9e6d07421baa881b914988e7c1ee1b7c";
+       version = "1.6.0.1";
+       sha256 = "f727ef24f8591c2d6aea64d85c569db56db5324093dcf569d417ac6b1582d0f0";
        libraryHaskellDepends = [
          attoparsec base blaze-markup blaze-svg bytestring cereal
          cereal-vector containers data-default-class diagrams-core
@@ -15169,6 +15196,32 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "ShellCheck_0_4_5" = callPackage
+    ({ mkDerivation, base, containers, directory, json, mtl, parsec
+     , process, QuickCheck, regex-tdfa
+     }:
+     mkDerivation {
+       pname = "ShellCheck";
+       version = "0.4.5";
+       sha256 = "53039ac314b99af691a99aec111572ee51b0579280c7fa5795ac48d0c4e02fa7";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers directory json mtl parsec process QuickCheck
+         regex-tdfa
+       ];
+       executableHaskellDepends = [
+         base containers directory json mtl parsec QuickCheck regex-tdfa
+       ];
+       testHaskellDepends = [
+         base containers directory json mtl parsec QuickCheck regex-tdfa
+       ];
+       homepage = "http://www.shellcheck.net/";
+       description = "Shell script analysis tool";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Shellac" = callPackage
     ({ mkDerivation, base, directory, mtl, unix }:
      mkDerivation {
@@ -15391,8 +15444,8 @@ self: {
      }:
      mkDerivation {
        pname = "Slides";
-       version = "0.1.0.8";
-       sha256 = "1058d7ccedef0081bec5a4f7ebbb70e7e564d70ee642d3fd49920b0be569c57c";
+       version = "0.1.0.9";
+       sha256 = "2a969435dc7025a0e1d7ae2fe28db3dd8c71f010790c3545bceba118e65bd049";
        libraryHaskellDepends = [
          base colour diagrams-lib diagrams-svg file-embed regex-applicative
        ];
@@ -15617,8 +15670,8 @@ self: {
     ({ mkDerivation, attoparsec, base, extra, mwc-random, text }:
      mkDerivation {
        pname = "Spintax";
-       version = "0.1.0.0";
-       sha256 = "d9d115f107f3b9a8e44a605d4b44727ff385974f3fd2d1d5b5a40a380467feec";
+       version = "0.1.0.1";
+       sha256 = "bf749b240dcec32068ca1b94f34bfd824722f57c63c0c81473fd8ff88533dfe7";
        libraryHaskellDepends = [ attoparsec base extra mwc-random text ];
        homepage = "https://github.com/MichelBoucey/spintax";
        description = "Random text generation based on spintax";
@@ -16273,10 +16326,8 @@ self: {
      }:
      mkDerivation {
        pname = "Taxonomy";
-       version = "1.0.1";
-       sha256 = "22d434dc827c75c0ab2075f81e689de22ed7a79d955625fdee18f047570ca289";
-       revision = "1";
-       editedCabalFile = "b8a2e83455df8cc4f08354e0f28625d0a16c94a5d54fda667d7e3a8bfeb369f3";
+       version = "1.0.2";
+       sha256 = "343e94d5cd555a99b242b50d253b0862c2174f7d3ea2b4935cdac642a414d21c";
        libraryHaskellDepends = [
          aeson base bytestring either-unwrap fgl graphviz parsec text vector
        ];
@@ -17118,14 +17169,14 @@ self: {
        license = "GPL";
      }) {};
 
-  "ViennaRNAParser_1_3_0" = callPackage
+  "ViennaRNAParser_1_3_1" = callPackage
     ({ mkDerivation, base, hspec, parsec, ParsecTools, process
      , transformers
      }:
      mkDerivation {
        pname = "ViennaRNAParser";
-       version = "1.3.0";
-       sha256 = "a0d10a770b194f3bf6ed5143f89ea3654eebe860bf980a85806c84889efea738";
+       version = "1.3.1";
+       sha256 = "a113dd5673a20802e3377ee1682c901c898e341a3cc0175e619c92eb96e49247";
        libraryHaskellDepends = [
          base parsec ParsecTools process transformers
        ];
@@ -19774,29 +19825,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "aeson_1_0_2_0" = callPackage
+  "aeson_1_0_2_1" = callPackage
     ({ mkDerivation, attoparsec, base, base-compat, base-orphans
-     , bytestring, containers, deepseq, dlist, generic-deriving
-     , ghc-prim, hashable, hashable-time, HUnit, QuickCheck
-     , quickcheck-instances, scientific, tagged, template-haskell
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , text, time, time-locale-compat, unordered-containers, vector
+     , base16-bytestring, bytestring, containers, deepseq, dlist
+     , generic-deriving, ghc-prim, hashable, hashable-time, HUnit
+     , QuickCheck, quickcheck-instances, scientific, tagged
+     , template-haskell, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, time, time-locale-compat
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "aeson";
-       version = "1.0.2.0";
-       sha256 = "c265f138a906caebeb8d539b9acf6006a7d2edcc2912e6346f0fb158b2135b6f";
+       version = "1.0.2.1";
+       sha256 = "e0a66fba0a9996063d0e241b0b868c6271b6aeb457821a78bfcaac5d84c89066";
        libraryHaskellDepends = [
          attoparsec base base-compat bytestring containers deepseq dlist
          ghc-prim hashable scientific tagged template-haskell text time
          time-locale-compat unordered-containers vector
        ];
        testHaskellDepends = [
-         attoparsec base base-compat base-orphans bytestring containers
-         dlist generic-deriving ghc-prim hashable hashable-time HUnit
-         QuickCheck quickcheck-instances scientific tagged template-haskell
-         test-framework test-framework-hunit test-framework-quickcheck2 text
-         time time-locale-compat unordered-containers vector
+         attoparsec base base-compat base-orphans base16-bytestring
+         bytestring containers dlist generic-deriving ghc-prim hashable
+         hashable-time HUnit QuickCheck quickcheck-instances scientific
+         tagged template-haskell test-framework test-framework-hunit
+         test-framework-quickcheck2 text time time-locale-compat
+         unordered-containers vector
        ];
        homepage = "https://github.com/bos/aeson";
        description = "Fast JSON parsing and encoding";
@@ -20767,14 +20820,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "aivika-realtime" = callPackage
+    ({ mkDerivation, aivika, aivika-transformers, async, base
+     , containers, mtl, stm, time
+     }:
+     mkDerivation {
+       pname = "aivika-realtime";
+       version = "0.1";
+       sha256 = "843febd0367be16058268bb2d3e5cb65b42018c69aa21dd1351089b72a4a81bf";
+       libraryHaskellDepends = [
+         aivika aivika-transformers async base containers mtl stm time
+       ];
+       homepage = "http://www.aivikasoft.com/en/products/aivika.html";
+       description = "Soft real-time simulation module for the Aivika library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "aivika-transformers" = callPackage
     ({ mkDerivation, aivika, array, base, containers, mtl, random
      , vector
      }:
      mkDerivation {
        pname = "aivika-transformers";
-       version = "4.5";
-       sha256 = "c86a3db16ffcf528bed4b97cd764ebec3888dc39afa80d9bd7340e178f4b5111";
+       version = "4.5.1";
+       sha256 = "76bfd156d6e9d037adf65b22ea1b66c75ed15ec00fd6b773c34e1c60ac12444a";
        libraryHaskellDepends = [
          aivika array base containers mtl random vector
        ];
@@ -20915,14 +20984,12 @@ self: {
      }) {};
 
   "alex-tools" = callPackage
-    ({ mkDerivation, base, template-haskell, text }:
+    ({ mkDerivation, base, deepseq, template-haskell, text }:
      mkDerivation {
        pname = "alex-tools";
-       version = "0.1.0.0";
-       sha256 = "0e15fed255f7eb609c6cd4834c1f95888cd1f0ee4793e17c1759b12f2c6a58e6";
-       revision = "1";
-       editedCabalFile = "d0ac2206fc41c34888c991591aeba577f4d20d0ce7847e63604477322dc02053";
-       libraryHaskellDepends = [ base template-haskell text ];
+       version = "0.1.1.0";
+       sha256 = "c0a1c33e24955a7e2536ef5ad7614b227523330ed4c68724fda47ba4ba368d86";
+       libraryHaskellDepends = [ base deepseq template-haskell text ];
        description = "A set of functions for a common use case of Alex";
        license = stdenv.lib.licenses.isc;
      }) {};
@@ -21544,6 +21611,28 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka_1_4_4_1" = callPackage
+    ({ mkDerivation, amazonka-core, base, bytestring, conduit
+     , conduit-extra, directory, exceptions, http-conduit, ini, mmorph
+     , monad-control, mtl, resourcet, retry, tasty, tasty-hunit, text
+     , time, transformers, transformers-base, transformers-compat
+     }:
+     mkDerivation {
+       pname = "amazonka";
+       version = "1.4.4.1";
+       sha256 = "0c0937d745ad39d34e1e6588497311721e4c7f995d0beab313def44893e47ede";
+       libraryHaskellDepends = [
+         amazonka-core base bytestring conduit conduit-extra directory
+         exceptions http-conduit ini 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";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-apigateway" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -21563,6 +21652,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-apigateway_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-apigateway";
+       version = "1.4.4";
+       sha256 = "a32aab9e4c78b15f609de4718845e593dcd5c4c29ee18643dde47c9c33adba21";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon API Gateway SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-application-autoscaling" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -21581,6 +21689,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-application-autoscaling_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-application-autoscaling";
+       version = "1.4.4";
+       sha256 = "f45fc7dd0b3b7be5cd4fa188cf7b0a3007c48db11ee8c92cbf16e6e20ea66f7e";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Application Auto Scaling SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-autoscaling" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -21599,6 +21726,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-autoscaling_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-autoscaling";
+       version = "1.4.4";
+       sha256 = "bb54c9340d38d4b08cbb43321eaad731416a38dda4a36e768e12d0d54ec8ab13";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Auto Scaling SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-certificatemanager" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -21617,6 +21763,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-certificatemanager_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-certificatemanager";
+       version = "1.4.4";
+       sha256 = "dea7c0aaa3f69f3da3f8755ee47a4a402603aad8602f3a8ce92a302fabbf0fc6";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Certificate Manager SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-cloudformation" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -21635,6 +21800,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-cloudformation_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-cloudformation";
+       version = "1.4.4";
+       sha256 = "aee7abe767b8287213406e1e79db9be1d83f510f9239f8faf7e03cca3e40a923";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon CloudFormation SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-cloudfront" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -21653,6 +21837,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-cloudfront_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-cloudfront";
+       version = "1.4.4";
+       sha256 = "ef921bc77e37c6e0cc8ad8943fe11360ecc0f7ae3031fd99cfc4a28023201cfb";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon CloudFront SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-cloudhsm" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -21671,6 +21874,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-cloudhsm_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-cloudhsm";
+       version = "1.4.4";
+       sha256 = "cf37dcb18bd9baa0cd8ddcf334fdbf9a649a5aebacc63a11b7e9de70f994d5d4";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon CloudHSM SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-cloudsearch" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -21689,6 +21911,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-cloudsearch_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-cloudsearch";
+       version = "1.4.4";
+       sha256 = "27c1fe0dee9fbb1ec9f1d90e89527483133d14cf85b9199cbf9b7e96f3586e42";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon CloudSearch SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-cloudsearch-domains" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -21707,6 +21948,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-cloudsearch-domains_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-cloudsearch-domains";
+       version = "1.4.4";
+       sha256 = "f5516758925123c47a89ffb1abe120efca0ac2c0f218babc13089f7c6e78e1ff";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon CloudSearch Domain SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-cloudtrail" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -21725,6 +21985,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-cloudtrail_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-cloudtrail";
+       version = "1.4.4";
+       sha256 = "114a334efd63d9b5ef8b50425a96e8672e5d84f6cabb2b8d4c15784d1afa4b46";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon CloudTrail SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-cloudwatch" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -21743,6 +22022,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-cloudwatch_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-cloudwatch";
+       version = "1.4.4";
+       sha256 = "e76a1f166dd3f4ac110579961f4b142a42017e800d401a7fd8bfa85ecea0257c";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon CloudWatch SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-cloudwatch-events" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -21761,6 +22059,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-cloudwatch-events_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-cloudwatch-events";
+       version = "1.4.4";
+       sha256 = "cf7be01a292dbeb153560891f2eb65df1583df0248073668211320bf5fbe2559";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon CloudWatch Events SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-cloudwatch-logs" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -21779,6 +22096,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-cloudwatch-logs_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-cloudwatch-logs";
+       version = "1.4.4";
+       sha256 = "4c29612100b88bd6d9e611f20e555ed69939e66e9e1502561ae345095ba23060";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon CloudWatch Logs SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-codecommit" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -21797,6 +22133,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-codecommit_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-codecommit";
+       version = "1.4.4";
+       sha256 = "02d3c4988f82a20b2175a99203aec701efbeeb25a47bda53f6a755937f77d261";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon CodeCommit SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-codedeploy" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -21815,6 +22170,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-codedeploy_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-codedeploy";
+       version = "1.4.4";
+       sha256 = "d900d37a7f47aaeec516dd149a2d2a8595a2dfaa75168624d49fdb96d2246482";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon CodeDeploy SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-codepipeline" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -21833,6 +22207,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-codepipeline_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-codepipeline";
+       version = "1.4.4";
+       sha256 = "dca521df26d5f53de2780b72a3d9c922326cc48847519e1ad088f330a5c02a6e";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon CodePipeline SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-cognito-identity" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -21851,6 +22244,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-cognito-identity_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-cognito-identity";
+       version = "1.4.4";
+       sha256 = "61dc9389d62ee2f260dec8c3ba07a03afdb01c5150ac87b49ffba58561ce16df";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Cognito Identity SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-cognito-idp" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -21869,6 +22281,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-cognito-idp_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-cognito-idp";
+       version = "1.4.4";
+       sha256 = "8e7370f170810959f61aaf2030f570e4486f24c2741cd185339e6c06039dc263";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Cognito Identity Provider SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-cognito-sync" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -21887,6 +22318,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-cognito-sync_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-cognito-sync";
+       version = "1.4.4";
+       sha256 = "85c4ff9369475464be0c912557b7e05876a401240ed63eb9582293e39c655c59";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Cognito Sync SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-config" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -21905,6 +22355,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-config_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-config";
+       version = "1.4.4";
+       sha256 = "a0d2e3dc82dbdcf3387a2ba5be959442b261b31083e063453cf4c1a4fd1b9a91";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Config SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-core" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
      , case-insensitive, conduit, conduit-extra, cryptonite, deepseq
@@ -21937,6 +22406,37 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-core_1_4_4" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
+     , case-insensitive, conduit, conduit-extra, cryptonite, deepseq
+     , exceptions, hashable, http-conduit, 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, xml-conduit, xml-types
+     }:
+     mkDerivation {
+       pname = "amazonka-core";
+       version = "1.4.4";
+       sha256 = "ad0b79e5f369d079389250310ac865125f41b8025b18bbec93293e787112f45b";
+       libraryHaskellDepends = [
+         aeson attoparsec base bifunctors bytestring case-insensitive
+         conduit conduit-extra cryptonite deepseq exceptions hashable
+         http-conduit http-types lens memory mtl resourcet scientific
+         semigroups tagged text time transformers transformers-compat
+         unordered-containers xml-conduit xml-types
+       ];
+       testHaskellDepends = [
+         aeson base bytestring case-insensitive http-types QuickCheck
+         quickcheck-unicode tasty tasty-hunit tasty-quickcheck
+         template-haskell text time
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Core data types and functionality for Amazonka libraries";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-datapipeline" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -21955,6 +22455,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-datapipeline_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-datapipeline";
+       version = "1.4.4";
+       sha256 = "cd68a5f94435542e4a348b23931ab619f866ed9ce773d500f6575eb9e1b5c1cb";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Data Pipeline SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-devicefarm" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -21973,6 +22492,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-devicefarm_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-devicefarm";
+       version = "1.4.4";
+       sha256 = "242a32cdb5502ac586f2e1ffb2921280907cbf6eecaaf431206bb6f3aa5d8e3b";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Device Farm SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-directconnect" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -21991,6 +22529,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-directconnect_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-directconnect";
+       version = "1.4.4";
+       sha256 = "043dbd7e4ebc086155270118ca4329f3ad03a730c0b8aabe183958fba844de0d";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Direct Connect SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-discovery" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22009,6 +22566,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-discovery_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-discovery";
+       version = "1.4.4";
+       sha256 = "9bbb7e4f2baec019ce8fb41ff6382e5fa1a7c3010012cad2f7d315f5220e8045";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Application Discovery Service SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-dms" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22027,6 +22603,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-dms_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-dms";
+       version = "1.4.4";
+       sha256 = "a8f6b3684de4d1b190aebf1966e2497fc8f8b18bed3dea687e4603fe8b70caaa";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Database Migration Service SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-ds" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22045,6 +22640,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-ds_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-ds";
+       version = "1.4.4";
+       sha256 = "5cae6b1926cfd6ea5f7fb4ad596a3d7fec80ad6e2ae6bb37f837ce5e5a9b48a0";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Directory Service SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-dynamodb" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22063,6 +22677,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-dynamodb_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-dynamodb";
+       version = "1.4.4";
+       sha256 = "9e0d23783e6e02eb3dd3edaa890a90a92be51024bd1e25967e680e8be257f49e";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon DynamoDB SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-dynamodb-streams" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22081,6 +22714,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-dynamodb-streams_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-dynamodb-streams";
+       version = "1.4.4";
+       sha256 = "575ee098e69bf18cb59549cac9ff4ce9c40ef54860b58210886290c933b04fa9";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon DynamoDB Streams SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-ec2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22099,6 +22751,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-ec2_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-ec2";
+       version = "1.4.4";
+       sha256 = "6fef83cb09e9ca74a6f1fb18f3add1420fc6c237aeafdb450a97d3216037741c";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Elastic Compute Cloud SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-ecr" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22117,6 +22788,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-ecr_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-ecr";
+       version = "1.4.4";
+       sha256 = "d38d111fa1801b048fcadd67475b0a916a0813636607df2db48747c8190148db";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon EC2 Container Registry SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-ecs" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22135,6 +22825,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-ecs_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-ecs";
+       version = "1.4.4";
+       sha256 = "fd2b867115fcd1a0b0ea992f3d2e902d7a5b66cce7c62da66ee1ac49c93aa574";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon EC2 Container Service SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-efs" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22153,6 +22862,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-efs_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-efs";
+       version = "1.4.4";
+       sha256 = "fb10cf8284a036623620f80c5fd938d5200e4e5ba67a8352e5549479a5661544";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Elastic File System SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-elasticache" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22171,6 +22899,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-elasticache_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-elasticache";
+       version = "1.4.4";
+       sha256 = "70a1bfb0f6f48d4c7d650c20c0397b6722f9658e59c99b330ad1002bfdaedc2f";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon ElastiCache SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-elasticbeanstalk" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22189,6 +22936,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-elasticbeanstalk_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-elasticbeanstalk";
+       version = "1.4.4";
+       sha256 = "ebd1f78511256ff1592e71bd4368308689faec1fbee98d7217436a735cf93270";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Elastic Beanstalk SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-elasticsearch" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22207,6 +22973,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-elasticsearch_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-elasticsearch";
+       version = "1.4.4";
+       sha256 = "c69aefafbd4a6117fec49da4dac96bf26ac06f82474b6b515f99803f00c87222";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Elasticsearch Service SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-elastictranscoder" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22225,6 +23010,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-elastictranscoder_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-elastictranscoder";
+       version = "1.4.4";
+       sha256 = "1d66ce985ba936e20b13364c672b4e3f017edbeae2ecc5005899f20072844ec7";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Elastic Transcoder SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-elb" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22243,6 +23047,43 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-elb_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-elb";
+       version = "1.4.4";
+       sha256 = "1fac7fd383a58c8455e0de38fbafc9aff7fd6301594adafe3660380f16a63f4f";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Elastic Load Balancing SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-elbv2" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-elbv2";
+       version = "1.4.4";
+       sha256 = "41587adac7111d7fd6e4c913bdb3a135fab0a81b90b8d137f4554043de7a9ba2";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Elastic Load Balancing SDK";
+       license = "unknown";
+     }) {};
+
   "amazonka-emr" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22261,6 +23102,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-emr_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-emr";
+       version = "1.4.4";
+       sha256 = "5c9ad06a37ffa2d8c79ad068430c361c7e792f59528846aae18380f75453dcd7";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Elastic MapReduce SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-gamelift" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22279,6 +23139,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-gamelift_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-gamelift";
+       version = "1.4.4";
+       sha256 = "bfef8aeb54f867d9c818405082022492c47ff4bcea2239610b51d8529b73707b";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon GameLift SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-glacier" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22297,6 +23176,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-glacier_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-glacier";
+       version = "1.4.4";
+       sha256 = "551f1dd605fcd0d8efc2cf8db2fefd1385eefcbe40aee62ed7991acae8c19b7a";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Glacier SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-iam" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22315,6 +23213,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-iam_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-iam";
+       version = "1.4.4";
+       sha256 = "b2911ae52d1476f7109a96c2fc2e1ba58950aae6de57aefc1c4ad0c74be19067";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Identity and Access Management SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-importexport" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22333,6 +23250,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-importexport_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-importexport";
+       version = "1.4.4";
+       sha256 = "463e6ad69547306e34848a40382aea4ff187b1fc7e838481b08f9ad5970167df";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Import/Export SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-inspector" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22351,6 +23287,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-inspector_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-inspector";
+       version = "1.4.4";
+       sha256 = "76fe8fc64f948ed26e36c11fe7aa3650bd7f971726a2dbd5215d3be58ff1ba01";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Inspector SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-iot" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22369,6 +23324,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-iot_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-iot";
+       version = "1.4.4";
+       sha256 = "fde976b7e41af4cb3d3a6399f0a8e5b76993f11b94381a1fffdafbdc2c67a1bd";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon IoT SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-iot-dataplane" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22387,6 +23361,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-iot-dataplane_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-iot-dataplane";
+       version = "1.4.4";
+       sha256 = "ba3451574fbf7a49ec5f50e5c8479bfb3235db42a792760d01247968412900f5";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon IoT Data Plane SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-kinesis" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22405,6 +23398,43 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-kinesis_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-kinesis";
+       version = "1.4.4";
+       sha256 = "734f9f465eec775faa97f0379933d469ce35c8ac6651bfd47b530ccc3d0c739a";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Kinesis SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-kinesis-analytics" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-kinesis-analytics";
+       version = "1.4.4";
+       sha256 = "fe628e5e65947849c7ec390140144d257bebf994ea2a76ddb6b11eaee69c02a9";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Kinesis Analytics SDK";
+       license = "unknown";
+     }) {};
+
   "amazonka-kinesis-firehose" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22423,6 +23453,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-kinesis-firehose_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-kinesis-firehose";
+       version = "1.4.4";
+       sha256 = "33274c4050b98ce89cb5495a92642d9ea99edcff70a2c8e994c6761921a4bef9";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Kinesis Firehose SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-kms" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22441,6 +23490,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-kms_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-kms";
+       version = "1.4.4";
+       sha256 = "20537bfd340f26e2f78fde482754e362e2a9369d4697141192c1cd3e759a62ac";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Key Management Service SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-lambda" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22459,6 +23527,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-lambda_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-lambda";
+       version = "1.4.4";
+       sha256 = "0dd073dd98625b829ed38345f57615f65492158c6731b9ca7522414d24ba9eb3";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Lambda SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-marketplace-analytics" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22477,6 +23564,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-marketplace-analytics_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-marketplace-analytics";
+       version = "1.4.4";
+       sha256 = "0027736e24e0fe98388269a64c8d27fbec52e6c6944241c22a6d9d8dbd191d2d";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Marketplace Commerce Analytics SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-marketplace-metering" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22495,6 +23601,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-marketplace-metering_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-marketplace-metering";
+       version = "1.4.4";
+       sha256 = "047fa110ee9969017e81b1643dfc653c86efa7cb10999bb2185ebac1a4832397";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Marketplace Metering SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-ml" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22513,6 +23638,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-ml_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-ml";
+       version = "1.4.4";
+       sha256 = "f03c3da79b2e386f5355f2b5f8cab536f739b99aa44865a33876b751de15cd12";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Machine Learning SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-opsworks" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22531,6 +23675,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-opsworks_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-opsworks";
+       version = "1.4.4";
+       sha256 = "8b15270cfe54ff8ab6f427118771bc26878ac5f21bd2bd0785b74c6736bab2ba";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon OpsWorks SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-rds" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22550,6 +23713,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-rds_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-rds";
+       version = "1.4.4";
+       sha256 = "dbc9ae2a6945ee1cad0c7ac0df9557dd362648b0ee8b73ccfc7e7da79f732f30";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Relational Database Service SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-redshift" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22568,6 +23750,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-redshift_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-redshift";
+       version = "1.4.4";
+       sha256 = "1329dfc9055b46d1539a871d2c148760f1f62802a2d7b3d4253aacd91b7caa2d";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Redshift SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-route53" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22586,6 +23787,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-route53_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-route53";
+       version = "1.4.4";
+       sha256 = "74cb1fa132aa0888c8c12acd1aca4e87360ae4a238052dcf21fc3070a10d609d";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Route 53 SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-route53-domains" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22604,6 +23824,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-route53-domains_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-route53-domains";
+       version = "1.4.4";
+       sha256 = "bbcdbda4a0f0a7bc408e033183bc46cc680b121d43d2ad44a66b07c70195a6f1";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Route 53 Domains SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-s3" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , lens, tasty, tasty-hunit, text, time, unordered-containers
@@ -22622,6 +23861,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-s3_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , lens, tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-s3";
+       version = "1.4.4";
+       sha256 = "bd32c46e99cca9c1acf6647813975411c5fec92690982fc2e00881da58759435";
+       libraryHaskellDepends = [ amazonka-core base lens text ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Simple Storage Service SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-sdb" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22640,6 +23898,43 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-sdb_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-sdb";
+       version = "1.4.4";
+       sha256 = "eae1f14a0ae2e0ea39ed9a1212d63fe9d7262e01d05bce8869b83525e690c58d";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon SimpleDB SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-servicecatalog" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-servicecatalog";
+       version = "1.4.4";
+       sha256 = "6d2766375d3ed2b0f3b4f4604eab62887a23a7ecd64c1a8c8ed5411a1af0432a";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Service Catalog SDK";
+       license = "unknown";
+     }) {};
+
   "amazonka-ses" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22658,6 +23953,43 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-ses_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-ses";
+       version = "1.4.4";
+       sha256 = "ceb5a1d20b2b2a2b5cbb6e54a731f82902552c01f5b7406cedd469256e74ec56";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Simple Email Service SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "amazonka-snowball" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-snowball";
+       version = "1.4.4";
+       sha256 = "d66c1d7ed36ff62a79a973ba9afbd2e050933d59350bfc65e7fc0a59d7b26103";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Import/Export Snowball SDK";
+       license = "unknown";
+     }) {};
+
   "amazonka-sns" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22676,6 +24008,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-sns_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-sns";
+       version = "1.4.4";
+       sha256 = "335f380c3579f139ab5deff522fbfd07398ba6019214923e92657b322a8eadef";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Simple Notification Service SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-sqs" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22695,6 +24046,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-sqs_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-sqs";
+       version = "1.4.4";
+       sha256 = "cfd9c9d4ee269a36a9f05f4fae6261f8707fcf43d738b57758bdbf43a9eff466";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Simple Queue Service SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-ssm" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22713,6 +24083,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-ssm_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-ssm";
+       version = "1.4.4";
+       sha256 = "fdf85f55da22e55c8569b2f5149e7f45acd99a6d3bd656d42977f8885a3e727f";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Simple Systems Management Service SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-storagegateway" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22731,6 +24120,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-storagegateway_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-storagegateway";
+       version = "1.4.4";
+       sha256 = "5375ce7683cd502795f810dbefd8207b823b1d74a63a29f1f3b9c3bd1bf458c7";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Storage Gateway SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-sts" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22749,6 +24157,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-sts_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-sts";
+       version = "1.4.4";
+       sha256 = "5eac6f9cb9b5710cf24fdae9f46362d05ae3f1d14a791c7439653b6f2a3f9b9f";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Security Token Service SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-support" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22767,6 +24194,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-support_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-support";
+       version = "1.4.4";
+       sha256 = "162469b9af326e2a6003a86783fb9275e6ba7c402452c200e94380bbd83455e2";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Support SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-swf" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22785,6 +24231,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-swf_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-swf";
+       version = "1.4.4";
+       sha256 = "f99a09b5d58a125c2cf3f52a2e20fec1b8d5f9b1aac40e01ee4f53872c67f574";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Simple Workflow Service SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-test" = callPackage
     ({ mkDerivation, aeson, amazonka-core, base, bifunctors, bytestring
      , case-insensitive, conduit, conduit-extra, groom, http-client
@@ -22807,6 +24272,29 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-test_1_4_4" = callPackage
+    ({ mkDerivation, aeson, amazonka-core, base, bifunctors, bytestring
+     , case-insensitive, conduit, conduit-extra, groom, http-client
+     , http-types, process, resourcet, tasty, tasty-hunit
+     , template-haskell, temporary, text, time, unordered-containers
+     , yaml
+     }:
+     mkDerivation {
+       pname = "amazonka-test";
+       version = "1.4.4";
+       sha256 = "5491b4cc27f41dd85daacaab0cc5e6b8630c5bb1581e3997f65d0b7b2ef6e5f0";
+       libraryHaskellDepends = [
+         aeson amazonka-core base bifunctors bytestring case-insensitive
+         conduit conduit-extra groom http-client http-types 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";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-waf" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22825,6 +24313,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-waf_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-waf";
+       version = "1.4.4";
+       sha256 = "8a3b59a42d1344cd48418764b17afabacdc1720247af144f332282e41104e88b";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon WAF SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-workspaces" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -22843,6 +24350,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "amazonka-workspaces_1_4_4" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-workspaces";
+       version = "1.4.4";
+       sha256 = "ea89d4cd168dec09787c276ede32ce85536d46e15c88a3fcfe5b3205303307e7";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon WorkSpaces SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ampersand" = callPackage
     ({ mkDerivation, base, bytestring, conduit, containers, csv
      , directory, filepath, graphviz, hashable, HStringTemplate, lens
@@ -22924,6 +24450,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amqp-worker" = callPackage
+    ({ mkDerivation, aeson, amqp, base, bytestring, data-default
+     , exceptions, monad-control, mtl, resource-pool, split, tasty
+     , tasty-hunit, text, transformers-base
+     }:
+     mkDerivation {
+       pname = "amqp-worker";
+       version = "0.2.1";
+       sha256 = "f3b89e4286f84b4d1029d4750184831b2fcb5f194446fb1b1d938824abcf08a4";
+       libraryHaskellDepends = [
+         aeson amqp base bytestring data-default exceptions monad-control
+         mtl resource-pool split text transformers-base
+       ];
+       testHaskellDepends = [
+         aeson amqp base bytestring tasty tasty-hunit text
+       ];
+       description = "High level functions for working with message queues";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "amrun" = callPackage
     ({ mkDerivation, base, deepseq, parsec }:
      mkDerivation {
@@ -24025,25 +25571,6 @@ self: {
      }) {};
 
   "app-settings" = callPackage
-    ({ mkDerivation, base, containers, directory, hspec, HUnit, mtl
-     , parsec, text
-     }:
-     mkDerivation {
-       pname = "app-settings";
-       version = "0.2.0.8";
-       sha256 = "b31c0da1a2bde88f1e366dda17703c62ddc7ed97740221bc90f4aaaa483fea68";
-       libraryHaskellDepends = [
-         base containers directory mtl parsec text
-       ];
-       testHaskellDepends = [
-         base containers directory hspec HUnit mtl parsec text
-       ];
-       homepage = "https://github.com/emmanueltouzery/app-settings";
-       description = "A library to manage application settings (INI file-like)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "app-settings_0_2_0_9" = callPackage
     ({ mkDerivation, base, containers, directory, hspec, HUnit, mtl
      , parsec, text
      }:
@@ -24060,7 +25587,6 @@ self: {
        homepage = "https://github.com/emmanueltouzery/app-settings";
        description = "A library to manage application settings (INI file-like)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "appar" = callPackage
@@ -24202,6 +25728,8 @@ self: {
        pname = "apply-refact";
        version = "0.3.0.0";
        sha256 = "0d2a8845ed554c4a6742a3d0a130dac3f16d0d710b65b20dfeb8e773409ed70f";
+       revision = "1";
+       editedCabalFile = "372095fc0b1e53e884362d5650486b4c2fb624588271a7b4917903ea977899ea";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -25047,8 +26575,8 @@ self: {
     ({ mkDerivation, base, random-extras, random-fu, text }:
      mkDerivation {
        pname = "ascii-cows";
-       version = "0.0.1.0";
-       sha256 = "dd20c8858ae432ced8c34d0a8b0deb6bf5ff805a5283fc4735d852df92282aac";
+       version = "0.0.2.0";
+       sha256 = "f8a387478eba76fc0616bd0c891bf18afbb9ebc55f0cedfb143a6355b196b635";
        libraryHaskellDepends = [ base random-extras random-fu text ];
        homepage = "http://github.com/passy/cows-hs";
        description = "A collection of ASCII cows. Moo.";
@@ -25166,6 +26694,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "asciidiagram_1_3_2" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory, filepath
+     , FontyFruity, JuicyPixels, lens, linear, mtl, optparse-applicative
+     , rasterific-svg, svg-tree, text, vector
+     }:
+     mkDerivation {
+       pname = "asciidiagram";
+       version = "1.3.2";
+       sha256 = "11eb37084513a6b510f88f043a10c2cdc9b039041b6e5d3ae0decd7c40de4784";
+       isLibrary = true;
+       isExecutable = true;
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "asic" = callPackage
     ({ mkDerivation, asil, base, bytestring, utf8-string }:
      mkDerivation {
@@ -25692,8 +27244,8 @@ self: {
      }:
      mkDerivation {
        pname = "atom-basic";
-       version = "0.2.3";
-       sha256 = "eeda4762c5f41029a6cddc56005db42d7761f4bbe23fe275f3223ef3afe6b4f9";
+       version = "0.2.4";
+       sha256 = "b37fb9757b78ff4a8e6586815cb2b9768c73f58cc3f27f635a4ab63736d529eb";
        libraryHaskellDepends = [
          base base64-bytestring bytestring network network-uri text time
        ];
@@ -26390,6 +27942,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "autom" = callPackage
+    ({ mkDerivation, base, bytestring, colour, ghc-prim, gloss
+     , JuicyPixels, random, vector
+     }:
+     mkDerivation {
+       pname = "autom";
+       version = "0.1.0.3";
+       sha256 = "40ddb2e519a584624d2e7228f52f48ad5ee57675d46edf2ef4f55b703663c6bf";
+       libraryHaskellDepends = [
+         base bytestring colour ghc-prim gloss JuicyPixels random vector
+       ];
+       homepage = "https://qlfiles.net/the-ql-files/next-nearest-neighbors-cellular-automata";
+       description = "Generates and displays patterns from next nearest neighbors cellular automata";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "automitive-cse" = callPackage
     ({ mkDerivation, base, bytestring, cereal, cryptonite, memory
      , quickcheck-simple
@@ -27437,6 +29005,40 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bake_0_5" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cmdargs, containers
+     , deepseq, direct-sqlite, directory, disk-free-space, extra
+     , filepath, hashable, HTTP, http-client, http-conduit, http-types
+     , old-locale, process, random, safe, shake, smtp-mail
+     , sqlite-simple, text, time, transformers, unordered-containers
+     , wai, wai-extra, warp
+     }:
+     mkDerivation {
+       pname = "bake";
+       version = "0.5";
+       sha256 = "1cc3b57b6270a2c80f0b0a8b90fc3929eb0d1da9e113d18bc10d92b40a2d60f5";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring cmdargs containers deepseq direct-sqlite
+         directory disk-free-space extra filepath hashable HTTP http-client
+         http-conduit http-types old-locale random safe shake smtp-mail
+         sqlite-simple text time transformers unordered-containers wai
+         wai-extra warp
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring cmdargs containers deepseq direct-sqlite
+         directory disk-free-space extra filepath hashable HTTP http-client
+         http-conduit http-types old-locale process random safe shake
+         smtp-mail sqlite-simple text time transformers unordered-containers
+         wai wai-extra warp
+       ];
+       homepage = "https://github.com/ndmitchell/bake#readme";
+       description = "Continuous integration system";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bamboo" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-default
      , directory, filepath, gravatar, hack, hack-contrib, haskell98, mps
@@ -28234,8 +29836,8 @@ self: {
     ({ mkDerivation, base, bytestring, data-default, entropy, memory }:
      mkDerivation {
        pname = "bcrypt";
-       version = "0.0.9";
-       sha256 = "33b87031fe80d2be666df7e892b11dcb35f630d7fb93dd95e3920d86b5c91553";
+       version = "0.0.10";
+       sha256 = "0498f9ff8df2bd0bcb4cd718c6fccd01f29837de164e24624fa32e0bfeed0eb6";
        libraryHaskellDepends = [
          base bytestring data-default entropy memory
        ];
@@ -29142,6 +30744,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "binary-ieee754" = callPackage
+    ({ mkDerivation, array, base, binary }:
+     mkDerivation {
+       pname = "binary-ieee754";
+       version = "0.1.0.0";
+       sha256 = "15c489898bcd346b4067a27579cb5fc62e2fafecbec81ea0446165a24aee4d54";
+       libraryHaskellDepends = [ array base binary ];
+       homepage = "https://github.com/winterland1989/binary-ieee754";
+       description = "Backport ieee754 float double combinators to older binary";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "binary-indexed-tree" = callPackage
     ({ mkDerivation, array, base }:
      mkDerivation {
@@ -29371,27 +30985,26 @@ self: {
      }) {};
 
   "binary-tagged" = callPackage
-    ({ mkDerivation, aeson, array, base, bifunctors, binary
-     , binary-orphans, bytestring, containers, generics-sop, hashable
-     , nats, quickcheck-instances, scientific, semigroups, SHA, tagged
-     , tasty, tasty-quickcheck, text, time, unordered-containers, vector
+    ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors
+     , binary, binary-orphans, bytestring, containers, generics-sop
+     , hashable, nats, quickcheck-instances, scientific, semigroups, SHA
+     , tagged, tasty, tasty-quickcheck, text, time, unordered-containers
+     , vector
      }:
      mkDerivation {
        pname = "binary-tagged";
-       version = "0.1.4.0";
-       sha256 = "dc25744ebd21f8a050341cd7c25c69f66734b2930aaad89b411cf68c28605671";
-       revision = "1";
-       editedCabalFile = "0448d0fe13530497a639b2bd8fc290522fa526aee5e3486bc15003797cd84bc7";
+       version = "0.1.4.1";
+       sha256 = "86ae562f528dd85e1d87f2e4c886be168e1b1dd78c42e22ae3e9bf36ff879acd";
        libraryHaskellDepends = [
-         aeson array base binary bytestring containers generics-sop hashable
-         nats scientific semigroups SHA tagged text time
-         unordered-containers vector
+         aeson array base base16-bytestring binary bytestring containers
+         generics-sop hashable nats scientific semigroups SHA tagged text
+         time unordered-containers vector
        ];
        testHaskellDepends = [
-         aeson array base bifunctors binary binary-orphans bytestring
-         containers generics-sop hashable nats quickcheck-instances
-         scientific semigroups SHA tagged tasty tasty-quickcheck text time
-         unordered-containers vector
+         aeson array base base16-bytestring bifunctors binary binary-orphans
+         bytestring containers generics-sop hashable nats
+         quickcheck-instances scientific semigroups SHA tagged tasty
+         tasty-quickcheck text time unordered-containers vector
        ];
        homepage = "https://github.com/phadej/binary-tagged#readme";
        description = "Tagged binary serialisation";
@@ -30660,6 +32273,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "bitcoin-hs" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, containers
+     , deepseq, directory, filepath, ghc-prim, HTTP, json, mtl, network
+     , network-uri, old-locale, QuickCheck, random, tasty, tasty-hunit
+     , tasty-quickcheck, time, transformers
+     }:
+     mkDerivation {
+       pname = "bitcoin-hs";
+       version = "0.0.1";
+       sha256 = "a9782eee40af1ab626c030cbfbec4a0302aefbf670b1006a3fe321f9f0707507";
+       libraryHaskellDepends = [
+         array base binary bytestring containers deepseq directory filepath
+         ghc-prim HTTP json mtl network network-uri old-locale random time
+         transformers
+       ];
+       testHaskellDepends = [
+         array base binary bytestring containers mtl old-locale QuickCheck
+         random tasty tasty-hunit tasty-quickcheck time transformers
+       ];
+       homepage = "http://code.haskell.org/~bkomuves/";
+       description = "Partial implementation of the Bitcoin protocol (as of 2013)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "bitcoin-payment-channel" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, base58string
      , base64-bytestring, bytestring, cereal, errors, haskoin-core
@@ -30685,25 +32322,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "bitcoin-payment-channel_0_4_0_1" = callPackage
+  "bitcoin-payment-channel_0_6_0_0" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring
      , bytestring, cereal, errors, haskoin-core, hexstring, QuickCheck
-     , scientific, string-conversions, text, time
+     , scientific, string-conversions, tagged, test-framework
+     , test-framework-quickcheck2, text, time
      }:
      mkDerivation {
        pname = "bitcoin-payment-channel";
-       version = "0.4.0.1";
-       sha256 = "98f5f1bd94d6c828404f5fdda6976cffb226bcbfd8321d73e7eb0367c6442f62";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.6.0.0";
+       sha256 = "487e5bb74a3a6c6829971d1071576b302c70298160f9b03654911e2094bcc011";
        libraryHaskellDepends = [
-         aeson base base16-bytestring base64-bytestring bytestring cereal
-         errors haskoin-core hexstring scientific string-conversions text
-         time
+         aeson base base16-bytestring bytestring cereal errors haskoin-core
+         hexstring QuickCheck scientific string-conversions tagged text time
        ];
-       executableHaskellDepends = [
+       testHaskellDepends = [
          aeson base base16-bytestring base64-bytestring bytestring cereal
-         haskoin-core hexstring QuickCheck string-conversions text time
+         haskoin-core hexstring QuickCheck string-conversions test-framework
+         test-framework-quickcheck2 text time
        ];
        homepage = "https://github.com/runeksvendsen/bitcoin-payment-channel";
        description = "Library for working with Bitcoin payment channels";
@@ -31604,6 +33240,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "blazeT" = callPackage
+    ({ mkDerivation, base, blaze-builder, blaze-html, blaze-markup
+     , bytestring, Cabal, mtl, text, transformers
+     }:
+     mkDerivation {
+       pname = "blazeT";
+       version = "0.0.4";
+       sha256 = "8ff74e6a75f4c77b13d122e57b9ef61e7365a7df0ca5efa7f1aba3a42a39c204";
+       setupHaskellDepends = [ base Cabal ];
+       libraryHaskellDepends = [
+         base blaze-builder blaze-html blaze-markup bytestring mtl text
+         transformers
+       ];
+       homepage = "http://johannesgerer.com/blazeT";
+       description = "A true monad (transformer) version of the blaze-markup and blaze-html libraries";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "blink1" = callPackage
     ({ mkDerivation, base, bytestring, text, unix, usb, vector }:
      mkDerivation {
@@ -34687,8 +36341,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal2nix";
-       version = "2.0.2";
-       sha256 = "f0c61d4674bbc9ba82d306adbb9fb39527aa73309fdea088489940fe39b02867";
+       version = "2.0.3";
+       sha256 = "d3e2f376bf255daab8ea476831c8f4948e774e7307b19dbceb15a7f0df882654";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -35028,26 +36682,28 @@ self: {
      }) {};
 
   "cake3" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq
-     , directory, filepath, haskell-src-meta, language-javascript
+    ({ mkDerivation, array, attoparsec, base, blaze-builder, bytestring
+     , containers, deepseq, directory, filepath, haskell-src-meta
      , mime-types, monadloc, mtl, optparse-applicative, parsec, process
      , syb, system-filepath, template-haskell, text, text-format
+     , transformers, utf8-string
      }:
      mkDerivation {
        pname = "cake3";
-       version = "0.6.0";
-       sha256 = "b8419752bc8fe97ae83193137d423261cd87d3adf403adfad615ee68312e044c";
+       version = "0.6.5";
+       sha256 = "7b6ec21ac935a057e6c78d0509cd0df0520954cfea2395e25b6767a352bd1bb9";
        isLibrary = true;
        isExecutable = true;
        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
+         haskell-src-meta 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
+         array attoparsec base blaze-builder bytestring containers directory
+         filepath haskell-src-meta mime-types monadloc mtl
          optparse-applicative parsec process syb template-haskell text
+         transformers utf8-string
        ];
        homepage = "https://github.com/grwlf/cake3";
        description = "Third cake the Makefile EDSL";
@@ -38434,24 +40090,6 @@ self: {
      }) {};
 
   "clash-systemverilog" = callPackage
-    ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
-     , text, unordered-containers, wl-pprint-text
-     }:
-     mkDerivation {
-       pname = "clash-systemverilog";
-       version = "0.6.9";
-       sha256 = "502f2c31093762ce8d4dc8dcb9a13b69c3a298fdfd1f417581d4f0438ed865ff";
-       libraryHaskellDepends = [
-         base clash-lib clash-prelude fgl lens mtl text unordered-containers
-         wl-pprint-text
-       ];
-       homepage = "http://www.clash-lang.org/";
-       description = "CAES Language for Synchronous Hardware - SystemVerilog backend";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "clash-systemverilog_0_6_10" = callPackage
     ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
      , text, unordered-containers, wl-pprint-text
      }:
@@ -38470,24 +40108,6 @@ self: {
      }) {};
 
   "clash-verilog" = callPackage
-    ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
-     , text, unordered-containers, wl-pprint-text
-     }:
-     mkDerivation {
-       pname = "clash-verilog";
-       version = "0.6.9";
-       sha256 = "a4daac5e9c67349de419e301ab969922d63bd4680061288a8b24bb10b2f78e3b";
-       libraryHaskellDepends = [
-         base clash-lib clash-prelude fgl lens mtl text unordered-containers
-         wl-pprint-text
-       ];
-       homepage = "http://www.clash-lang.org/";
-       description = "CAES Language for Synchronous Hardware - Verilog backend";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "clash-verilog_0_6_10" = callPackage
     ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
      , text, unordered-containers, wl-pprint-text
      }:
@@ -40138,14 +41758,17 @@ self: {
      }) {};
 
   "colonnade" = callPackage
-    ({ mkDerivation, base, bytestring, contravariant, text, vector }:
+    ({ mkDerivation, base, bytestring, contravariant, doctest, text
+     , vector
+     }:
      mkDerivation {
        pname = "colonnade";
-       version = "0.4.6";
-       sha256 = "8dc53d83e276c1768099491ab9754ac4f04a60aacbe361ad1cdf0db1c05e1aeb";
+       version = "0.4.7";
+       sha256 = "45bdd0a8d67e483f52d3212149d3dda99813aef4c00a6d4118b425d7d7e49457";
        libraryHaskellDepends = [
          base bytestring contravariant text vector
        ];
+       testHaskellDepends = [ base doctest ];
        homepage = "https://github.com/andrewthad/colonnade#readme";
        description = "Generic types and functions for columnar encoding and decoding";
        license = stdenv.lib.licenses.bsd3;
@@ -41991,6 +43614,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "configurator-ng" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, critbit
+     , data-ordlist, directory, dlist, fail, filepath, hashable, HUnit
+     , scientific, test-framework, test-framework-hunit, text
+     , unix-compat, unordered-containers
+     }:
+     mkDerivation {
+       pname = "configurator-ng";
+       version = "0.0.0.0";
+       sha256 = "4995a132a0fcbf80c47198daab2530dd09ff87f227b265354236e188d8ec8aa5";
+       libraryHaskellDepends = [
+         attoparsec base bytestring critbit data-ordlist directory dlist
+         fail hashable scientific text unix-compat unordered-containers
+       ];
+       testHaskellDepends = [
+         base bytestring directory filepath HUnit test-framework
+         test-framework-hunit text
+       ];
+       homepage = "http://github.com/lpsmith/configurator-ng";
+       description = "The next generation of configuration management";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "confsolve" = callPackage
     ({ mkDerivation, attoparsec, base, cmdargs, process, system-fileio
      , system-filepath, text, time, unordered-containers
@@ -43560,8 +45206,8 @@ self: {
      }:
      mkDerivation {
        pname = "cplex-hs";
-       version = "0.4.0.4";
-       sha256 = "2c9e5f8719d53ffb0121a2c88e5bb43a627a54de3ce3028713c0f8426ba175eb";
+       version = "0.5.0.0";
+       sha256 = "22a3fbe663b18effaff54269d16e76aa9513d8a00d4773c3f5555d1a2f5d1567";
        libraryHaskellDepends = [
          base containers hashable mtl primitive transformers
          unordered-containers vector
@@ -44957,6 +46603,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cryptohash-sha512" = callPackage
+    ({ mkDerivation, base, base16-bytestring, bytestring, SHA, tasty
+     , tasty-hunit, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "cryptohash-sha512";
+       version = "0.11.100.1";
+       sha256 = "10698bb9575eaa414a65d9644caa9408f9276c63447406e0a4faef91db1071a9";
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [
+         base base16-bytestring bytestring SHA tasty tasty-hunit
+         tasty-quickcheck
+       ];
+       homepage = "https://github.com/hvr/cryptohash-sha512";
+       description = "Fast, pure and practical SHA-512 implementation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "cryptol" = callPackage
     ({ mkDerivation, alex, ansi-terminal, array, async, base
      , base-compat, bytestring, containers, deepseq, directory, filepath
@@ -45557,10 +47221,8 @@ self: {
      }:
      mkDerivation {
        pname = "cuda";
-       version = "0.7.5.0";
-       sha256 = "125ce9d7d8e782272ed0a00b0a15ee2273477c4a9f1aa34e86220f2ab4573e6b";
-       revision = "1";
-       editedCabalFile = "9abe02e16497b7969918e53356b456f650ca1d11927fc9f37980c2da9141dee1";
+       version = "0.7.5.1";
+       sha256 = "0910d9e4f0b3a46d9bda2de495ae9024799c21764bc543b99edea64e65180385";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal directory filepath ];
@@ -45728,8 +47390,8 @@ self: {
     ({ mkDerivation, base, mtl, tasty, tasty-hunit }:
      mkDerivation {
        pname = "curryrs";
-       version = "0.1.1.0";
-       sha256 = "d7e44d1726192f13a9227ca90008d3dc37c0dcc294b9f1dad2260806b803da71";
+       version = "0.2.0";
+       sha256 = "1cdb55745936dbca5224dbb36a7006b85164a3bcc3e6af0c2670c0c0f8bb9adb";
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        homepage = "https://github.com/mgattozzi/curryrs#readme";
@@ -47443,22 +49105,22 @@ self: {
   "data-msgpack" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers
      , data-binary-ieee754, deepseq, groom, hashable, hspec, QuickCheck
-     , text, unordered-containers
+     , text, unordered-containers, vector, void
      }:
      mkDerivation {
        pname = "data-msgpack";
-       version = "0.0.4";
-       sha256 = "77e894dd366c77352cc52787546ff0419831b312f4b6b86e864e2e2e5b1e33af";
+       version = "0.0.8";
+       sha256 = "069552052ce2f62b64621513df5e4eec4a9dc9aa02f28e8095373724fc696ae0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base binary bytestring containers data-binary-ieee754 deepseq
-         hashable QuickCheck text unordered-containers
+         hashable QuickCheck text unordered-containers vector void
        ];
        executableHaskellDepends = [ base bytestring groom ];
        testHaskellDepends = [
          base bytestring containers hashable hspec QuickCheck text
-         unordered-containers
+         unordered-containers vector void
        ];
        homepage = "http://msgpack.org/";
        description = "A Haskell implementation of MessagePack";
@@ -48290,32 +49952,83 @@ self: {
 
   "dbmigrations" = callPackage
     ({ mkDerivation, base, bytestring, configurator, containers
-     , directory, fgl, filepath, HDBC, HDBC-postgresql, HDBC-sqlite3
-     , HUnit, MissingH, mtl, mysql, mysql-simple, process, random, split
-     , template-haskell, text, time, yaml-light
+     , directory, fgl, filepath, HDBC, HUnit, MissingH, mtl, process
+     , random, split, template-haskell, text, time, yaml-light
      }:
      mkDerivation {
        pname = "dbmigrations";
-       version = "1.1.1";
-       sha256 = "d36742052ed45f933e7883bb542c070c881685df721e526d4abc25e7a1444c9f";
+       version = "2.0.0";
+       sha256 = "bd95b2082c34487277f4b6cf1407729881a847a837829d5b68307931a0a11bfe";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base bytestring configurator containers directory fgl filepath HDBC
-         HDBC-postgresql HDBC-sqlite3 mtl mysql mysql-simple random split
-         template-haskell text time yaml-light
+         HUnit mtl random split template-haskell text time yaml-light
        ];
        executableHaskellDepends = [ base configurator ];
        testHaskellDepends = [
          base bytestring configurator containers directory fgl filepath HDBC
-         HDBC-postgresql HDBC-sqlite3 HUnit MissingH mtl mysql mysql-simple
-         process split template-haskell text time yaml-light
+         HUnit MissingH mtl process split template-haskell text time
+         yaml-light
        ];
        description = "An implementation of relational database \"migrations\"";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "dbmigrations-mysql" = callPackage
+    ({ mkDerivation, base, dbmigrations, HUnit, mysql, mysql-simple
+     , process, split, time
+     }:
+     mkDerivation {
+       pname = "dbmigrations-mysql";
+       version = "2.0.0";
+       sha256 = "45bd44c9e46bff2923634030ea6f54b9df93ef3b2ea38749c5263f7e00421f5c";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base dbmigrations mysql mysql-simple split time
+       ];
+       executableHaskellDepends = [ base dbmigrations ];
+       testHaskellDepends = [
+         base dbmigrations HUnit mysql mysql-simple process
+       ];
+       description = "The dbmigrations tool built for MySQL databases";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "dbmigrations-postgresql" = callPackage
+    ({ mkDerivation, base, dbmigrations, HDBC, HDBC-postgresql, HUnit
+     , process
+     }:
+     mkDerivation {
+       pname = "dbmigrations-postgresql";
+       version = "2.0.0";
+       sha256 = "fcf753778e2e071c8fa452c585b93c27c973bedee5fe9cb608e3fdbfe83ec92f";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base dbmigrations HDBC-postgresql ];
+       testHaskellDepends = [
+         base dbmigrations HDBC HDBC-postgresql HUnit process
+       ];
+       description = "The dbmigrations tool built for PostgreSQL databases";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "dbmigrations-sqlite" = callPackage
+    ({ mkDerivation, base, dbmigrations, HDBC, HDBC-sqlite3, HUnit }:
+     mkDerivation {
+       pname = "dbmigrations-sqlite";
+       version = "2.0.0";
+       sha256 = "0ca8140ac27919890c93f45c20bdd25b4c190eec60a330069d89cb8b9a481320";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base dbmigrations HDBC-sqlite3 ];
+       testHaskellDepends = [ base dbmigrations HDBC HDBC-sqlite3 HUnit ];
+       description = "The dbmigrations tool built for SQLite databases";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dbus" = callPackage
     ({ mkDerivation, base, bytestring, cereal, chell, chell-quickcheck
      , containers, directory, filepath, libxml-sax, network, parsec
@@ -49854,8 +51567,8 @@ self: {
      }:
      mkDerivation {
        pname = "deriving-compat";
-       version = "0.3.3";
-       sha256 = "b977e5f819c84443a355521579712a0cf138d5102d383e823381576a87898c21";
+       version = "0.3.4";
+       sha256 = "77c68a5c69be9c4385a163501da2d8dacf590a3d948bb1d01f570ef4abb0bf3d";
        libraryHaskellDepends = [
          base containers ghc-boot-th ghc-prim template-haskell transformers
          transformers-compat
@@ -50138,6 +51851,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "diagrams_1_4" = callPackage
+    ({ mkDerivation, diagrams-contrib, diagrams-core, diagrams-lib
+     , diagrams-svg
+     }:
+     mkDerivation {
+       pname = "diagrams";
+       version = "1.4";
+       sha256 = "8608f6fa682b8c43b9fbe7c42c033c7a6de0680bd7383f6a81ea8bca37999139";
+       libraryHaskellDepends = [
+         diagrams-contrib diagrams-core diagrams-lib diagrams-svg
+       ];
+       doHaddock = false;
+       homepage = "http://projects.haskell.org/diagrams";
+       description = "Embedded domain-specific language for declarative vector graphics";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "diagrams-boolean" = callPackage
     ({ mkDerivation, base, cubicbezier, diagrams-lib }:
      mkDerivation {
@@ -50154,19 +51885,20 @@ self: {
     ({ mkDerivation, base, base-orphans, bytestring, cmdargs
      , diagrams-cairo, diagrams-lib, diagrams-postscript
      , diagrams-rasterific, diagrams-svg, directory, exceptions
-     , filepath, hashable, haskell-src-exts, hint, JuicyPixels, lens
-     , mtl, split, svg-builder, transformers
+     , filepath, hashable, haskell-src-exts, haskell-src-exts-simple
+     , hint, JuicyPixels, lens, mtl, split, svg-builder, transformers
      }:
      mkDerivation {
        pname = "diagrams-builder";
-       version = "0.7.2.4";
-       sha256 = "34e7fbb9952cd5e3444f34bce5e1f3431017a18a42abc7174bc8b4635c496ebc";
+       version = "0.8";
+       sha256 = "28633d2a5374ba3c9e56ff798242889986b9a5958e0bd2b35df342b4ac4c5744";
        configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ];
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base base-orphans cmdargs diagrams-lib directory exceptions
-         filepath hashable haskell-src-exts hint lens mtl split transformers
+         filepath hashable haskell-src-exts haskell-src-exts-simple hint
+         lens mtl split transformers
        ];
        executableHaskellDepends = [
          base bytestring cmdargs diagrams-cairo diagrams-lib
@@ -50199,7 +51931,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "diagrams-cairo_1_3_1_2" = callPackage
+  "diagrams-cairo_1_4" = callPackage
     ({ mkDerivation, array, base, bytestring, cairo, colour, containers
      , data-default-class, diagrams-core, diagrams-lib, filepath
      , hashable, JuicyPixels, lens, mtl, optparse-applicative, pango
@@ -50207,8 +51939,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-cairo";
-       version = "1.3.1.2";
-       sha256 = "099ffe00c3fa0b6522ac2b5c4ed8beb0ff82884b164c147f3ec900dc773126f4";
+       version = "1.4";
+       sha256 = "a94ec8bfdba325cf317368355eaa282bef3c75ed78e153ef400b8627575cea81";
        libraryHaskellDepends = [
          array base bytestring cairo colour containers data-default-class
          diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl
@@ -50241,15 +51973,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "diagrams-canvas_1_3_0_7" = callPackage
+  "diagrams-canvas_1_4" = callPackage
     ({ mkDerivation, base, blank-canvas, cmdargs, containers
      , data-default-class, diagrams-core, diagrams-lib, lens, mtl
      , NumInstances, optparse-applicative, statestack, text
      }:
      mkDerivation {
        pname = "diagrams-canvas";
-       version = "1.3.0.7";
-       sha256 = "dd8477ed65f58d3137b5541e3c42994144af6ffc7e7f4b72b41754a86f1600da";
+       version = "1.4";
+       sha256 = "30622ff2478391caf31dd8cc6842043f33409e97a3e5fd9f9ca6ee8264b576e9";
        libraryHaskellDepends = [
          base blank-canvas cmdargs containers data-default-class
          diagrams-core diagrams-lib lens mtl NumInstances
@@ -50288,6 +52020,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "diagrams-contrib_1_4" = callPackage
+    ({ mkDerivation, base, circle-packing, colour, containers
+     , cubicbezier, data-default, data-default-class, diagrams-core
+     , diagrams-lib, diagrams-solve, force-layout, hashable, HUnit, lens
+     , linear, mfsolve, MonadRandom, monoid-extras, mtl, mtl-compat
+     , parsec, QuickCheck, random, semigroups, split, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, text
+     }:
+     mkDerivation {
+       pname = "diagrams-contrib";
+       version = "1.4";
+       sha256 = "1b06f7d5fb4ae77a851ef2c6e6f7193418e679198b757bbd75b81798c6f8dceb";
+       libraryHaskellDepends = [
+         base circle-packing colour containers cubicbezier data-default
+         data-default-class diagrams-core diagrams-lib diagrams-solve
+         force-layout hashable lens linear mfsolve MonadRandom monoid-extras
+         mtl mtl-compat parsec random semigroups split text
+       ];
+       testHaskellDepends = [
+         base containers diagrams-lib HUnit QuickCheck test-framework
+         test-framework-hunit test-framework-quickcheck2
+       ];
+       homepage = "http://projects.haskell.org/diagrams/";
+       description = "Collection of user contributions to diagrams EDSL";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "diagrams-core" = callPackage
     ({ mkDerivation, adjunctions, base, containers, distributive
      , dual-tree, lens, linear, monoid-extras, mtl, semigroups
@@ -50306,14 +52066,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "diagrams-core_1_4" = callPackage
+    ({ mkDerivation, adjunctions, base, containers, distributive
+     , dual-tree, lens, linear, monoid-extras, mtl, profunctors
+     , semigroups, unordered-containers
+     }:
+     mkDerivation {
+       pname = "diagrams-core";
+       version = "1.4";
+       sha256 = "e5502f483dadb86056523d601a1037596ff49380b4c1cd00600183eab7992ae7";
+       libraryHaskellDepends = [
+         adjunctions base containers distributive dual-tree lens linear
+         monoid-extras mtl profunctors semigroups unordered-containers
+       ];
+       homepage = "http://projects.haskell.org/diagrams";
+       description = "Core libraries for diagrams EDSL";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "diagrams-graphviz" = callPackage
     ({ mkDerivation, base, containers, diagrams-lib, fgl, graphviz
      , split
      }:
      mkDerivation {
        pname = "diagrams-graphviz";
-       version = "1.3.1";
-       sha256 = "09ae6f6d08d3ed43f6f6bf711e3749f1979b2e2e6976cbd7da05bd2a8f0d6a04";
+       version = "1.4";
+       sha256 = "483a41aaa9d73681ada40f8cfd3e967cf669f313200041eaf54db0800cca61d1";
        libraryHaskellDepends = [
          base containers diagrams-lib fgl graphviz split
        ];
@@ -50336,27 +52115,39 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "diagrams-gtk_1_4" = callPackage
+    ({ mkDerivation, base, cairo, diagrams-cairo, diagrams-lib, gtk }:
+     mkDerivation {
+       pname = "diagrams-gtk";
+       version = "1.4";
+       sha256 = "b66bde621a09b79b99185af50b2d1ed0b2bd3988c95ed27c7e92e5383917eae9";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "diagrams-haddock" = callPackage
     ({ mkDerivation, ansi-terminal, base, base64-bytestring, bytestring
      , Cabal, cautious-file, cmdargs, containers, cpphs
      , diagrams-builder, diagrams-lib, diagrams-svg, directory, filepath
-     , haskell-src-exts, lens, linear, lucid-svg, mtl, parsec
-     , QuickCheck, split, strict, tasty, tasty-quickcheck, text
-     , uniplate
+     , haskell-src-exts, lens, linear, mtl, parsec, QuickCheck, split
+     , strict, svg-builder, tasty, tasty-quickcheck, text, uniplate
      }:
      mkDerivation {
        pname = "diagrams-haddock";
-       version = "0.3.0.10";
-       sha256 = "49ed17c49c1aae075892e9992b691867e418944a37141f028a7a2e6220d6f0af";
-       revision = "1";
-       editedCabalFile = "c77d5d5a908d03ba9fc545f977ced5d393a22e6de5b9d00deb4fb7fddd4a366d";
+       version = "0.4";
+       sha256 = "79dbb7fa0b28b04cf0804fb993e04b22f7e1261089c0aa4e7fe06894edcce0b9";
        isLibrary = true;
        isExecutable = true;
        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
+         directory filepath haskell-src-exts lens linear mtl parsec split
+         strict svg-builder text uniplate
        ];
        executableHaskellDepends = [
          base Cabal cmdargs cpphs directory filepath
@@ -50408,6 +52199,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "diagrams-html5_1_4" = callPackage
+    ({ mkDerivation, base, cmdargs, containers, data-default-class
+     , diagrams-core, diagrams-lib, lens, mtl, NumInstances
+     , optparse-applicative, split, statestack, static-canvas, text
+     }:
+     mkDerivation {
+       pname = "diagrams-html5";
+       version = "1.4";
+       sha256 = "43653c946a4c2215d1fdf62e93f4b65ccd19c960aa8e1c7b8a4bd638fd71c1aa";
+       libraryHaskellDepends = [
+         base cmdargs containers data-default-class diagrams-core
+         diagrams-lib lens mtl NumInstances optparse-applicative split
+         statestack static-canvas text
+       ];
+       homepage = "http://projects.haskell.org/diagrams/";
+       description = "HTML5 canvas backend for diagrams drawing EDSL";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "diagrams-lib" = callPackage
     ({ mkDerivation, active, adjunctions, array, base, colour
      , containers, data-default-class, diagrams-core, diagrams-solve
@@ -50434,6 +52245,38 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "diagrams-lib_1_4" = callPackage
+    ({ mkDerivation, active, adjunctions, array, base, cereal, colour
+     , containers, data-default-class, deepseq, diagrams-core
+     , diagrams-solve, directory, distributive, dual-tree, exceptions
+     , filepath, fingertree, fsnotify, hashable, intervals, JuicyPixels
+     , lens, linear, monoid-extras, mtl, numeric-extras
+     , optparse-applicative, process, profunctors, semigroups, tagged
+     , tasty, tasty-hunit, tasty-quickcheck, text, transformers
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "diagrams-lib";
+       version = "1.4";
+       sha256 = "5aed2074a86e6f6cc030ff062d8a3a743aaf8fa9d7d9cd14c6d7b0b1d32112ad";
+       libraryHaskellDepends = [
+         active adjunctions array base cereal 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 profunctors semigroups tagged text
+         transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         base deepseq diagrams-solve lens numeric-extras tasty tasty-hunit
+         tasty-quickcheck
+       ];
+       homepage = "http://projects.haskell.org/diagrams";
+       description = "Embedded domain-specific language for declarative graphics";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "diagrams-pandoc" = callPackage
     ({ mkDerivation, base, diagrams-builder, diagrams-cairo
      , diagrams-lib, directory, filepath, linear, optparse-applicative
@@ -50485,8 +52328,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-pgf";
-       version = "0.1.0.5";
-       sha256 = "6f5a4274b447614599603b5cc819f723e262ba0794c3ed2bbe842079a48f6898";
+       version = "1.4";
+       sha256 = "068f1fbc8c3ebdfa37d47e96e060b8040c7425c014aecd8e4f022477a51e6687";
        libraryHaskellDepends = [
          base bytestring bytestring-builder colour containers diagrams-core
          diagrams-lib directory filepath hashable JuicyPixels mtl
@@ -50517,6 +52360,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "diagrams-postscript_1_4" = callPackage
+    ({ mkDerivation, base, containers, data-default-class
+     , diagrams-core, diagrams-lib, dlist, filepath, hashable, lens
+     , monoid-extras, mtl, semigroups, split, statestack
+     }:
+     mkDerivation {
+       pname = "diagrams-postscript";
+       version = "1.4";
+       sha256 = "fe58f0010520716f66802adb0c1f70f48e77e9c4fcea5441e5343f4c1a5f8db4";
+       libraryHaskellDepends = [
+         base containers data-default-class diagrams-core diagrams-lib dlist
+         filepath hashable lens monoid-extras mtl semigroups split
+         statestack
+       ];
+       homepage = "http://projects.haskell.org/diagrams/";
+       description = "Postscript backend for diagrams drawing EDSL";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "diagrams-qrcode" = callPackage
     ({ mkDerivation, array, base, colour, diagrams-core, diagrams-lib
      }:
@@ -50555,20 +52418,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "diagrams-rasterific_1_3_1_9" = callPackage
+  "diagrams-rasterific_1_4" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-default-class
-     , diagrams-core, diagrams-lib, filepath, FontyFruity, hashable
-     , JuicyPixels, lens, mtl, optparse-applicative, Rasterific, split
-     , unix
+     , diagrams-core, diagrams-lib, file-embed, filepath, FontyFruity
+     , hashable, JuicyPixels, lens, mtl, optparse-applicative
+     , Rasterific
      }:
      mkDerivation {
        pname = "diagrams-rasterific";
-       version = "1.3.1.9";
-       sha256 = "b3305657391f75b9f69c3a30905724c1151ea7cab78561c800657f7a81166ab8";
+       version = "1.4";
+       sha256 = "daea2cddf5175044f606c36388e12a14b13fe0aa2b5ce9c039c349e9c46015a4";
        libraryHaskellDepends = [
          base bytestring containers data-default-class diagrams-core
-         diagrams-lib filepath FontyFruity hashable JuicyPixels lens mtl
-         optparse-applicative Rasterific split unix
+         diagrams-lib file-embed filepath FontyFruity hashable JuicyPixels
+         lens mtl optparse-applicative Rasterific
        ];
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Rasterific backend for diagrams";
@@ -50596,13 +52459,15 @@ self: {
      }) {};
 
   "diagrams-rubiks-cube" = callPackage
-    ({ mkDerivation, base, data-default-class, diagrams-lib, lens }:
+    ({ mkDerivation, adjunctions, base, data-default-class
+     , diagrams-lib, distributive, lens
+     }:
      mkDerivation {
        pname = "diagrams-rubiks-cube";
-       version = "0.2.0.0";
-       sha256 = "ab91576655c3f7ca9fa859d8c9fff6bbefe2eb8405d3563cad6734cb71d4d5e7";
+       version = "0.2.0.1";
+       sha256 = "f8f54e7f03489d737dd979a1cd35f8c5411b3c8de7379ba07c365d480ec38592";
        libraryHaskellDepends = [
-         base data-default-class diagrams-lib lens
+         adjunctions base data-default-class diagrams-lib distributive lens
        ];
        homepage = "https://github.com/timjb/rubiks-cube";
        description = "Library for drawing the Rubik's Cube";
@@ -50644,22 +52509,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "diagrams-svg_1_4_0_4" = callPackage
+  "diagrams-svg_1_4_1" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, colour
-     , containers, diagrams-core, diagrams-lib, directory, filepath
-     , hashable, JuicyPixels, lens, monoid-extras, mtl, old-time
-     , optparse-applicative, process, semigroups, split, svg-builder
-     , text, time
+     , containers, diagrams-core, diagrams-lib, filepath, hashable
+     , JuicyPixels, lens, monoid-extras, mtl, optparse-applicative
+     , semigroups, split, svg-builder, text
      }:
      mkDerivation {
        pname = "diagrams-svg";
-       version = "1.4.0.4";
-       sha256 = "b9843885cd30a70b3acf97a0ce41934776d535777584b670f5b3ec4a39b6668c";
+       version = "1.4.1";
+       sha256 = "ce691378025835c7e794898a5f03299341f5f1e35a20de4afd12b1f9b0667f87";
        libraryHaskellDepends = [
          base base64-bytestring bytestring colour containers diagrams-core
-         diagrams-lib directory filepath hashable JuicyPixels lens
-         monoid-extras mtl old-time optparse-applicative process semigroups
-         split svg-builder text time
+         diagrams-lib filepath hashable JuicyPixels lens monoid-extras mtl
+         optparse-applicative semigroups split svg-builder text
        ];
        homepage = "http://projects.haskell.org/diagrams/";
        description = "SVG backend for diagrams drawing EDSL";
@@ -52515,8 +54378,8 @@ self: {
      }:
      mkDerivation {
        pname = "dns";
-       version = "2.0.7";
-       sha256 = "4032a94d66042eb989cb13c7d6dabd4dff898116d7cdb31bc0fa44a056550f8f";
+       version = "2.0.8";
+       sha256 = "ca9ba04f3fdc277033a9b16bf39d290e2b2fdc4d79c9c0c9b9aa5b8cf21bd5c9";
        libraryHaskellDepends = [
          attoparsec base binary bytestring bytestring-builder conduit
          conduit-extra containers iproute mtl network random resourcet safe
@@ -53051,20 +54914,27 @@ self: {
      }) {};
 
   "dotenv" = callPackage
-    ({ mkDerivation, base, base-compat, hspec, megaparsec
-     , optparse-applicative, process, text
+    ({ mkDerivation, base, base-compat, exceptions, hspec
+     , hspec-megaparsec, megaparsec, optparse-applicative, process, text
+     , transformers
      }:
      mkDerivation {
        pname = "dotenv";
-       version = "0.3.0.3";
-       sha256 = "df2dc890652e6a5dcec035c5050ebc71d8024583d73fe2164fc07b276b640760";
+       version = "0.3.1.0";
+       sha256 = "7f4e7c1717e486fd71a6d5507494d314a541e1c308787c7b49bfdbd77c868476";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base base-compat megaparsec text ];
+       libraryHaskellDepends = [
+         base base-compat exceptions megaparsec text transformers
+       ];
        executableHaskellDepends = [
          base base-compat megaparsec optparse-applicative process text
+         transformers
+       ];
+       testHaskellDepends = [
+         base base-compat exceptions hspec hspec-megaparsec megaparsec text
+         transformers
        ];
-       testHaskellDepends = [ base base-compat hspec megaparsec text ];
        homepage = "https://github.com/stackbuilders/dotenv-hs";
        description = "Loads environment variables from dotenv files";
        license = stdenv.lib.licenses.mit;
@@ -55286,6 +57156,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ekg-prometheus-adapter" = callPackage
+    ({ mkDerivation, base, containers, ekg-core, microlens-th
+     , prometheus, text, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "ekg-prometheus-adapter";
+       version = "0.1.0.3";
+       sha256 = "4dc997621c16c704a2cb19629385c76d7736f6e0bff1400cc1a83d5fd65f724a";
+       libraryHaskellDepends = [
+         base containers ekg-core microlens-th prometheus text transformers
+         unordered-containers
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/adinapoli/ekg-prometheus-adapter#readme";
+       description = "Easily expose your EKG metrics to Prometheus";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "ekg-push" = callPackage
     ({ mkDerivation, base, bytestring, ekg-core, text, time
      , unordered-containers
@@ -56442,6 +58330,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "envelope_0_2_1_0" = callPackage
+    ({ mkDerivation, aeson, base, doctest, Glob, http-api-data, mtl
+     , text
+     }:
+     mkDerivation {
+       pname = "envelope";
+       version = "0.2.1.0";
+       sha256 = "af8a043b4a1890e927ecc23827c2018d816071cd2cc5344543287897457276fe";
+       libraryHaskellDepends = [ aeson base http-api-data mtl text ];
+       testHaskellDepends = [ base doctest Glob ];
+       homepage = "https://github.com/cdepillabout/envelope#readme";
+       description = "Defines generic 'Envelope' type to wrap reponses from a JSON API";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "envparse" = callPackage
     ({ mkDerivation, base, containers, hspec, text }:
      mkDerivation {
@@ -56565,22 +58469,22 @@ self: {
 
   "epub-metadata" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , HUnit, hxt, mtl, regex-compat, zip-archive
+     , HUnit, hxt, mtl, regex-compat-tdfa, utf8-string, zip-archive
      }:
      mkDerivation {
        pname = "epub-metadata";
-       version = "4.4";
-       sha256 = "ca4f9ff02676a1abcbe5433deb655747a11f28e8f4dfcb4b94d7a073ab50bb62";
+       version = "4.5";
+       sha256 = "19ae3914df5936908c8d7264ae5f1e310262fa06bd7e4390838892840e4c0349";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring containers directory filepath hxt mtl regex-compat
-         zip-archive
+         base bytestring containers directory filepath hxt mtl
+         regex-compat-tdfa utf8-string zip-archive
        ];
        executableHaskellDepends = [ base mtl ];
        testHaskellDepends = [
-         base bytestring directory filepath HUnit hxt mtl regex-compat
-         zip-archive
+         base bytestring directory filepath HUnit hxt mtl regex-compat-tdfa
+         utf8-string zip-archive
        ];
        homepage = "http://hub.darcs.net/dino/epub-metadata";
        description = "Library for parsing epub document metadata";
@@ -56594,8 +58498,8 @@ self: {
      }:
      mkDerivation {
        pname = "epub-tools";
-       version = "2.8";
-       sha256 = "16a5004b4a408919a48e09f65f8ab1007132ddc2d9d0ffb2c5c1609f09395434";
+       version = "2.9";
+       sha256 = "eb550fbc268852c3e3c29eab32c9c2d171b5b1326f5e9676f42d4802dafb0ea5";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -58411,14 +60315,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "extra_1_5" = callPackage
+  "extra_1_5_1" = callPackage
     ({ mkDerivation, base, clock, directory, filepath, process
      , QuickCheck, time, unix
      }:
      mkDerivation {
        pname = "extra";
-       version = "1.5";
-       sha256 = "d6d78604f87b6ade3f3b4ec8af3d08efd2c981652b3ec9a9e8d5865018667b7f";
+       version = "1.5.1";
+       sha256 = "8f3397c7a176045f1bb3b2a181e36b54192cb6fb5e99a9d28552975130ec49fc";
        libraryHaskellDepends = [
          base clock directory filepath process time unix
        ];
@@ -59144,6 +61048,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fay-simplejson" = callPackage
+    ({ mkDerivation, fay-base }:
+     mkDerivation {
+       pname = "fay-simplejson";
+       version = "0.1.1.0";
+       sha256 = "78dbb8ad24149e93706d3630d5c9dcab9b263c0614e437eb14a6983953833c04";
+       libraryHaskellDepends = [ fay-base ];
+       homepage = "https://github.com/Lupino/fay-simplejson";
+       description = "SimpleJSON library for Fay";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "fay-text" = callPackage
     ({ mkDerivation, fay, fay-base, text }:
      mkDerivation {
@@ -59499,28 +61415,28 @@ self: {
      , concurrent-extra, conduit, conduit-extra, containers, data-hash
      , directory, distributed-process, distributed-process-async
      , distributed-process-client-server, distributed-process-extras
-     , distributed-process-simplelocalnet, exceptions, file-embed
-     , filepath, free, fsnotify, HUnit, logging, managed, network-uri
+     , distributed-process-p2p, exceptions, extra, file-embed, filepath
+     , free, fsnotify, HUnit, logging, managed, network-uri
      , optparse-applicative, process, reactive-banana, SafeSemaphore
      , tasty, tasty-hspec, tasty-hunit, tasty-quickcheck
      , tasty-smallcheck, temporary, text, time, transformers, yaml
      }:
      mkDerivation {
        pname = "feed-gipeda";
-       version = "0.2.0.0";
-       sha256 = "def3da09a8795ea8e86aead8360e86bf4142e0b28f8fb964b152f0ce48f628fe";
+       version = "0.3.0.0";
+       sha256 = "8a440f45d32a3eb0db3785b20601bd3031560da5776569d4c20762de3c44a98d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson async base binary bytestring concurrent-extra conduit
          conduit-extra containers data-hash directory distributed-process
          distributed-process-async distributed-process-client-server
-         distributed-process-extras distributed-process-simplelocalnet
-         file-embed filepath fsnotify logging network-uri process
-         reactive-banana SafeSemaphore temporary text time transformers yaml
+         distributed-process-extras distributed-process-p2p file-embed
+         filepath fsnotify logging network-uri process reactive-banana
+         SafeSemaphore temporary text time transformers yaml
        ];
        executableHaskellDepends = [
-         base directory filepath logging optparse-applicative
+         base directory extra filepath logging optparse-applicative
        ];
        testHaskellDepends = [
          async base bytestring conduit conduit-extra directory exceptions
@@ -61012,6 +62928,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "flat-mcmc_1_1_1" = callPackage
+    ({ mkDerivation, base, mcmc-types, monad-par, monad-par-extras
+     , mwc-probability, pipes, primitive, transformers, vector
+     }:
+     mkDerivation {
+       pname = "flat-mcmc";
+       version = "1.1.1";
+       sha256 = "24e2bc1b4728dd54326908332322f227cc2bf3548e6e1b07f0695a1c3167a88c";
+       libraryHaskellDepends = [
+         base mcmc-types monad-par monad-par-extras mwc-probability pipes
+         primitive transformers vector
+       ];
+       testHaskellDepends = [ base vector ];
+       homepage = "http://jtobin.github.com/flat-mcmc";
+       description = "Painless general-purpose sampling";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "flat-tex" = callPackage
     ({ mkDerivation, base, directory, parsec }:
      mkDerivation {
@@ -63143,8 +65078,8 @@ self: {
     ({ mkDerivation, base, doctest, Glob }:
      mkDerivation {
        pname = "from-sum";
-       version = "0.1.0.0";
-       sha256 = "cfc80660a6986b2a2dc07605a26a6bc3b010b9aecfbeb4a852e671106b37475c";
+       version = "0.1.2.0";
+       sha256 = "29449f195710ecdc601375ad0f853666bb93baf11f279b6f9f31783455cc51d9";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest Glob ];
        homepage = "https://github.com/cdepillabout/from-sum";
@@ -64064,14 +65999,15 @@ self: {
      }) {};
 
   "game-of-life" = callPackage
-    ({ mkDerivation, array, base, hscurses, random, text }:
+    ({ mkDerivation, array, base, hscurses, hspec, random, text }:
      mkDerivation {
        pname = "game-of-life";
-       version = "0.1.0.4";
-       sha256 = "5f500e662d6a158853950c69fe729cecdbaf2183275d20d770ffb5b196f050b4";
+       version = "0.1.0.5";
+       sha256 = "8bd15d6d2ede2bae8b49d057d6c742a677e68e518159cd99c660b9fed8b53fda";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base hscurses random text ];
+       testHaskellDepends = [ array base hspec ];
        homepage = "http://github.com/marcusbuffett/game-of-life";
        description = "Conway's Game of Life";
        license = stdenv.lib.licenses.mit;
@@ -66345,8 +68281,8 @@ self: {
     ({ mkDerivation, base, ghcjs-dom-jsaddle, text, transformers }:
      mkDerivation {
        pname = "ghcjs-dom";
-       version = "0.5.0.0";
-       sha256 = "e3ae6d76bdbff7011baa242123d707c4480dd51e3837d93d87109607c77f39fd";
+       version = "0.5.0.2";
+       sha256 = "78b95464b0101d3ffe9d23452c738bdb924c7a3737121e2a938fde863627bd8e";
        libraryHaskellDepends = [
          base ghcjs-dom-jsaddle text transformers
        ];
@@ -66388,8 +68324,8 @@ self: {
     ({ mkDerivation }:
      mkDerivation {
        pname = "ghcjs-dom-jsffi";
-       version = "0.5.0.0";
-       sha256 = "5b7197d8f2869af44f2d7aa925083af2253efbf93be59a09de1b5998ee22f385";
+       version = "0.5.0.2";
+       sha256 = "4e7042c09170af65a486a87a134d40519c1cecf663956349f26729490063d878";
        isLibrary = false;
        isExecutable = false;
        description = "DOM library using JSFFI and GHCJS";
@@ -66446,11 +68382,13 @@ self: {
        pname = "ghcjs-websockets";
        version = "0.3.0.5";
        sha256 = "f879f2ccfd4a98dfbe23b7e12aebda5207acfe10bcf3d67ec7d00ca06e83a7ce";
+       revision = "1";
+       editedCabalFile = "1901cc0693c96bc77c6484ac202ce8e6302c2eb2eb6b986a054aaaad9901b2ff";
        libraryHaskellDepends = [
          base base64-bytestring binary bytestring text
        ];
        homepage = "http://github.com/mstksg/ghcjs-websockets";
-       description = "GHCJS interface for the Javascript Websocket API";
+       description = "Deprecated: use ghcjs-base's native websockets";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -67651,8 +69589,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "6.20161012";
-       sha256 = "38dab20236f36780278d49a345fb8850305e994d6c83ff010b4d9fd04cd85cdc";
+       version = "6.20161027";
+       sha256 = "1e4d859434d5175bbe29843e3be03350e7412063bc340d12a1e31e04c80791cf";
        configureFlags = [
          "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
          "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3"
@@ -68691,8 +70629,8 @@ self: {
      }:
      mkDerivation {
        pname = "glirc";
-       version = "2.20.1";
-       sha256 = "1ddfb3fea3ccb962abacdd5556116ba0799a836201a757fb185abc641800f08d";
+       version = "2.20.1.1";
+       sha256 = "63f0f8d82ea8d2f90103faf9ccd9fa301275b9400bbf1c3db62f8c51cbfa40fe";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -68729,6 +70667,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "glob-posix" = callPackage
+    ({ mkDerivation, base, directory, filepath, tasty
+     , tasty-expected-failure, tasty-hunit, unix
+     }:
+     mkDerivation {
+       pname = "glob-posix";
+       version = "0.1.0.1";
+       sha256 = "3245382c77ebaceea958ef62510d073b96e10a43bf69536cf9079d69da363caf";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base directory filepath tasty tasty-expected-failure tasty-hunit
+         unix
+       ];
+       homepage = "https://github.com/rdnetto/glob-posix#readme";
+       description = "Haskell bindings for POSIX glob library";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "global" = callPackage
     ({ mkDerivation, base, haskell-src-exts, haskell-src-exts-qq
      , loch-th, SafeSemaphore, stm, syntax-trees-fork-bairyn, tagged
@@ -69065,8 +71021,8 @@ self: {
      }:
      mkDerivation {
        pname = "glue-common";
-       version = "0.4.8";
-       sha256 = "93e860fbbff04561621cd923081b111602a900dd2eb9306e1c77dc26b63b1912";
+       version = "0.4.9";
+       sha256 = "4c83dc5503aab468fa198433d0601eed88f55f366adde9bd329730bb4ecd9d95";
        libraryHaskellDepends = [
          base hashable lifted-base monad-control text time transformers
          transformers-base unordered-containers
@@ -69089,8 +71045,8 @@ self: {
      }:
      mkDerivation {
        pname = "glue-core";
-       version = "0.4.8";
-       sha256 = "145a86d1ef7c2a8c0dd10b258a6b93497986ae3789fe79b1389ecb02ab5b8178";
+       version = "0.4.9";
+       sha256 = "56c4a2782f74ee90aec320e2b393bae098ff7d0786bd5cf143260446ba23bd0c";
        libraryHaskellDepends = [
          base glue-common hashable lifted-base monad-control text time
          transformers transformers-base unordered-containers
@@ -69113,8 +71069,8 @@ self: {
      }:
      mkDerivation {
        pname = "glue-ekg";
-       version = "0.4.8";
-       sha256 = "9612eb9054420ae4f467b167356f1cbe1ed43ad2f62726810dbdd012c38a4501";
+       version = "0.4.9";
+       sha256 = "373c5792acba3ebc4f032a8e718681b89e0f3807c7e5c6563fa28cdf0e42203f";
        libraryHaskellDepends = [
          base ekg-core glue-common hashable lifted-base monad-control text
          time transformers transformers-base unordered-containers
@@ -69136,8 +71092,8 @@ self: {
      }:
      mkDerivation {
        pname = "glue-example";
-       version = "0.4.8";
-       sha256 = "3e75fea965b3d83e57c1ade5354811a96707111b912840b5c7c46c2d02ae330a";
+       version = "0.4.9";
+       sha256 = "2bea50121582b00107e452b48a6d70de47d8942461448efaec46cbf6739b977c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -69259,8 +71215,8 @@ self: {
      }:
      mkDerivation {
        pname = "gnss-converters";
-       version = "0.1.15";
-       sha256 = "4fd123578ac8037646072ce98ae2b0d34269fbc27649922b377a398fd3cb28cc";
+       version = "0.1.17";
+       sha256 = "4f40d2896ac66c3a42daaa8849639e4a98bc8152c1d28933a6aaaceb8679dfe6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -70826,8 +72782,8 @@ self: {
      }:
      mkDerivation {
        pname = "google-translate";
-       version = "0.2";
-       sha256 = "92b07c3ed6f1a815f4ef456c1612a3412701493afd665a0133200f7ef51676d7";
+       version = "0.3";
+       sha256 = "b89c6761fe3a8f4331f35a48b6758968449c2228fa00a68a69ccc9b11d9a1f64";
        libraryHaskellDepends = [
          aeson base bytestring http-api-data http-client servant
          servant-client text transformers
@@ -73473,12 +75429,12 @@ self: {
   "hablog" = callPackage
     ({ mkDerivation, base, bifunctors, blaze-html, blaze-markup
      , bytestring, containers, directory, filepath, markdown, mime-types
-     , mtl, scotty, scotty-tls, text, transformers
+     , mtl, optparse-applicative, scotty, scotty-tls, text, transformers
      }:
      mkDerivation {
        pname = "hablog";
-       version = "0.4.0";
-       sha256 = "c7bb65866e22621196cac657afc610a578a5bab290af06e5b8d221ea3da2b80d";
+       version = "0.5.1";
+       sha256 = "1a533a209b3db3035f155461ab900f6bdfd5654658a7450586257a34b604129d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -73486,7 +75442,7 @@ self: {
          directory filepath markdown mime-types mtl scotty scotty-tls text
          transformers
        ];
-       executableHaskellDepends = [ base ];
+       executableHaskellDepends = [ base optparse-applicative text ];
        description = "A blog system";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -74239,25 +76195,24 @@ self: {
      }) {};
 
   "hackernews" = callPackage
-    ({ mkDerivation, aeson, base, basic-sop, generics-sop, hspec
-     , http-client, http-client-tls, http-types, QuickCheck
-     , quickcheck-instances, servant, servant-client, string-conversions
-     , text, transformers
+    ({ mkDerivation, aeson, base, hspec, http-client, http-client-tls
+     , http-types, QuickCheck, quickcheck-instances, servant
+     , servant-client, string-conversions, text
      }:
      mkDerivation {
        pname = "hackernews";
-       version = "1.0.0.0";
-       sha256 = "a5fc6c2a3dae3b92eb63cd7bfa5353189919ed22f0e022a17790d510fec2b1e0";
+       version = "1.1.1.0";
+       sha256 = "6544eb03de96d0c9b6de1556b8efba3b4265f84ab65a351068fdad199c9fe844";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base http-client http-types servant servant-client
-         string-conversions text transformers
+         aeson base http-client http-types QuickCheck quickcheck-instances
+         servant servant-client string-conversions text
        ];
        executableHaskellDepends = [ base http-client http-client-tls ];
        testHaskellDepends = [
-         aeson base basic-sop generics-sop hspec http-client http-client-tls
-         QuickCheck quickcheck-instances transformers
+         aeson base hspec http-client http-client-tls QuickCheck
+         quickcheck-instances
        ];
        description = "API for Hacker News";
        license = stdenv.lib.licenses.mit;
@@ -75399,26 +77354,26 @@ self: {
      }) {};
 
   "hamsql" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, directory, doctemplates
-     , file-embed, filepath, frontmatter, groom, network-uri
-     , optparse-applicative, postgresql-simple, text, transformers
-     , unordered-containers, yaml
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
+     , doctemplates, file-embed, filepath, frontmatter, groom
+     , network-uri, optparse-applicative, postgresql-simple, text
+     , transformers, unordered-containers, yaml
      }:
      mkDerivation {
        pname = "hamsql";
-       version = "0.8.0.0";
-       sha256 = "fd12ea140ecf7f175ba1896c2aa53bba66cbfb93d8033dfa8432f0381062983b";
+       version = "0.9.0.0";
+       sha256 = "bb8c90e637cbe5fce26ef80ea6c2a078cdbdc06b927ba08f63b7b0ad23bb90b9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring directory doctemplates file-embed filepath
-         frontmatter groom network-uri optparse-applicative
+         aeson base bytestring containers directory doctemplates file-embed
+         filepath frontmatter groom network-uri optparse-applicative
          postgresql-simple text transformers unordered-containers yaml
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        homepage = "https://git.hemio.de/hemio/hamsql";
-       description = "HamSql";
+       description = "Interpreter for SQL-structure definitions in YAML (YamSql)";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -77649,20 +79604,6 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
-  "haskell-gi-base_0_19" = callPackage
-    ({ mkDerivation, base, bytestring, containers, glib, text }:
-     mkDerivation {
-       pname = "haskell-gi-base";
-       version = "0.19";
-       sha256 = "ff3241d123a03e486ea0b6cb10b36262bfcd90411ac19859aa5c08f60dfe2af9";
-       libraryHaskellDepends = [ base bytestring containers text ];
-       libraryPkgconfigDepends = [ glib ];
-       homepage = "https://github.com/haskell-gi/haskell-gi-base";
-       description = "Foundation for libraries generated by haskell-gi";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) glib;};
-
   "haskell-google-trends" = callPackage
     ({ mkDerivation, base, bytestring, haskell-fake-user-agent, lens
      , regex-base, regex-posix, tagsoup, text, wreq
@@ -79711,15 +81652,16 @@ self: {
      }) {};
 
   "hasql-backend" = callPackage
-    ({ mkDerivation, base-prelude, bytestring, either, free, list-t
-     , text, transformers, vector
+    ({ mkDerivation, base, base-prelude, bytestring, either, free
+     , list-t, text, transformers, vector
      }:
      mkDerivation {
        pname = "hasql-backend";
-       version = "0.4.2";
-       sha256 = "541a37b288ec5300e9830416a764ef54cce82415b3678c08af526f569e88c20a";
+       version = "0.4.3";
+       sha256 = "4df97b42c47d026b6371e423211805a061ffed4df464a9cecfe7f378c8362a88";
        libraryHaskellDepends = [
-         base-prelude bytestring either free list-t text transformers vector
+         base base-prelude bytestring either free list-t text transformers
+         vector
        ];
        homepage = "https://github.com/nikita-volkov/hasql-backend";
        description = "API for backends of \"hasql\"";
@@ -79858,8 +81800,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasql-postgres-options";
-       version = "0.1.5";
-       sha256 = "a2204c448f7a494d16f37ae36624914f73fc12bd7f25154d19706ea7302a5a90";
+       version = "0.1.6";
+       sha256 = "079556e632a048df511add7252ecd965e9df4b9e4af356a2c86f90ea64e713b3";
        libraryHaskellDepends = [
          base-prelude hasql-postgres optparse-applicative
        ];
@@ -81135,8 +83077,8 @@ self: {
      }:
      mkDerivation {
        pname = "hdo";
-       version = "0.1";
-       sha256 = "feb54ee5c028b828d752fba4a086b43227f14a5ed3d0b4fd4d3ccfb09745d11a";
+       version = "0.2";
+       sha256 = "4d031d84de97173db977731938918166f9dc54240ee53cac24d0ccf79b96c547";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -81335,18 +83277,23 @@ self: {
      }) {};
 
   "heckle" = callPackage
-    ({ mkDerivation, base, blaze-html, dates, directory, pandoc
-     , pandoc-types, process, split, tagsoup
+    ({ mkDerivation, base, blaze-html, dates, directory, filepath
+     , optparse-applicative, optparse-generic, pandoc, pandoc-types
+     , process, split, tagsoup
      }:
      mkDerivation {
        pname = "heckle";
-       version = "2.0.0.4";
-       sha256 = "cd6664f6b969d0f884a2826b7faeed0bd40bdfd99a74521aad080c706d827320";
-       isLibrary = false;
+       version = "2.0.1.1";
+       sha256 = "ba4defee459e282b1308ee66ed9148ea9bd936eae41136f82c6ffbb71981dd14";
+       isLibrary = true;
        isExecutable = true;
+       libraryHaskellDepends = [
+         base blaze-html dates directory filepath pandoc pandoc-types
+         process split tagsoup
+       ];
        executableHaskellDepends = [
-         base blaze-html dates directory pandoc pandoc-types process split
-         tagsoup
+         base directory filepath optparse-applicative optparse-generic
+         process split
        ];
        homepage = "https://github.com/2016rshah/heckle";
        description = "Jekyll in Haskell (feat. LaTeX)";
@@ -81527,39 +83474,28 @@ self: {
 
   "heist" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bifunctors, blaze-builder
-     , blaze-html, bytestring, containers, criterion, directory
-     , directory-tree, dlist, errors, filepath, hashable, HUnit, lens
-     , lifted-base, map-syntax, monad-control, mtl, process, QuickCheck
-     , random, statistics, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, text, time, transformers
-     , transformers-base, unordered-containers, vector, xmlhtml
+     , blaze-html, bytestring, containers, directory, directory-tree
+     , dlist, filepath, hashable, HUnit, lens, lifted-base, map-syntax
+     , monad-control, mtl, process, QuickCheck, random, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, text, time
+     , transformers, transformers-base, unordered-containers, vector
+     , xmlhtml
      }:
      mkDerivation {
        pname = "heist";
-       version = "1.0.0.0";
-       sha256 = "6c637ee835488dc716bf6fd929ea4de12578119ccf07766cb601910d160fec4f";
-       revision = "2";
-       editedCabalFile = "6da6ec8736d1cb25caa9ca7b82e0eab1ebd2c99804fa7ac23b933589f550a637";
-       isLibrary = true;
-       isExecutable = true;
+       version = "1.0.1.0";
+       sha256 = "fd4ff3c1bfc1473feb9e913a5cdecaf56bc9db022abc27a76768cb6345c68bcb";
        libraryHaskellDepends = [
          aeson attoparsec base blaze-builder blaze-html bytestring
          containers directory directory-tree dlist filepath hashable
          lifted-base map-syntax monad-control mtl process random text time
          transformers transformers-base unordered-containers vector xmlhtml
        ];
-       executableHaskellDepends = [
-         aeson attoparsec base blaze-builder blaze-html bytestring
-         containers criterion directory directory-tree dlist errors filepath
-         hashable HUnit lifted-base map-syntax monad-control mtl process
-         random statistics test-framework test-framework-hunit text time
-         transformers transformers-base unordered-containers vector xmlhtml
-       ];
        testHaskellDepends = [
          aeson attoparsec base bifunctors blaze-builder blaze-html
-         bytestring containers directory directory-tree dlist errors
-         filepath hashable HUnit lens lifted-base map-syntax monad-control
-         mtl process QuickCheck random test-framework test-framework-hunit
+         bytestring containers directory directory-tree dlist filepath
+         hashable HUnit lens lifted-base map-syntax monad-control mtl
+         process QuickCheck random test-framework test-framework-hunit
          test-framework-quickcheck2 text time transformers transformers-base
          unordered-containers vector xmlhtml
        ];
@@ -82007,8 +83943,8 @@ self: {
      }:
      mkDerivation {
        pname = "here";
-       version = "1.2.8";
-       sha256 = "2e6fcb0c498c787973f033455b4bc579cbfd0f86f0f958a05fc8502a3759c7ec";
+       version = "1.2.9";
+       sha256 = "c6e87d889bbfa414b7a4dcad0dc55aae1158630065d5f52408fe8b72adc8ff38";
        libraryHaskellDepends = [
          base haskell-src-meta mtl parsec template-haskell
        ];
@@ -84254,8 +86190,8 @@ self: {
      }:
      mkDerivation {
        pname = "hjsonpointer";
-       version = "1.0.0.1";
-       sha256 = "e438e501f48cadbe7352cf0fc93b5fb744c99acba465f7280afdb0d3c504713f";
+       version = "1.0.0.2";
+       sha256 = "98e2675781d11e1c9eb903b6a7c35020137625e305efb0fcb8f7614f09e6e8f2";
        libraryHaskellDepends = [
          aeson base QuickCheck text unordered-containers vector
        ];
@@ -84295,7 +86231,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hjsonschema_1_2_0_1" = callPackage
+  "hjsonschema_1_2_0_2" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
      , directory, file-embed, filepath, hjsonpointer, hspec, http-client
      , http-types, pcre-heavy, profunctors, QuickCheck, scientific
@@ -84304,8 +86240,8 @@ self: {
      }:
      mkDerivation {
        pname = "hjsonschema";
-       version = "1.2.0.1";
-       sha256 = "85df5af566ed80b814b5b1757dee2acbde8f0c979747b34d28094552dcf5a960";
+       version = "1.2.0.2";
+       sha256 = "dc6aa03f842609ed43910510a3d5bf58bab38e94d3117ec9f669ef50ce33dd00";
        libraryHaskellDepends = [
          aeson base bytestring containers file-embed filepath hjsonpointer
          http-client http-types pcre-heavy profunctors QuickCheck scientific
@@ -84456,6 +86392,71 @@ self: {
        license = "GPL";
      }) {};
 
+  "hledger_1_0_1" = callPackage
+    ({ mkDerivation, base, base-compat, bytestring, cmdargs, containers
+     , csv, data-default, directory, file-embed, filepath, hashable
+     , haskeline, hledger-lib, HUnit, megaparsec, mtl, mtl-compat
+     , old-time, parsec, pretty-show, process, regex-tdfa, safe
+     , shakespeare, split, tabular, temporary, terminfo, test-framework
+     , test-framework-hunit, text, time, transformers
+     , unordered-containers, utf8-string, wizards
+     }:
+     mkDerivation {
+       pname = "hledger";
+       version = "1.0.1";
+       sha256 = "835de42bebfbf55a53714c24ea4df31b625ee12f0766aa83aa552ba6c39b7104";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base-compat bytestring cmdargs containers csv data-default
+         directory file-embed filepath hashable haskeline hledger-lib HUnit
+         megaparsec mtl mtl-compat old-time pretty-show process regex-tdfa
+         safe shakespeare split tabular temporary terminfo text time
+         transformers unordered-containers utf8-string wizards
+       ];
+       executableHaskellDepends = [
+         base base-compat bytestring cmdargs containers csv data-default
+         directory file-embed filepath haskeline hledger-lib HUnit mtl
+         mtl-compat old-time parsec pretty-show process regex-tdfa safe
+         shakespeare split tabular temporary terminfo text time
+         unordered-containers utf8-string wizards
+       ];
+       testHaskellDepends = [
+         base base-compat bytestring cmdargs containers csv data-default
+         directory file-embed filepath haskeline hledger-lib HUnit mtl
+         mtl-compat old-time parsec pretty-show process regex-tdfa safe
+         shakespeare split tabular temporary terminfo test-framework
+         test-framework-hunit text time unordered-containers utf8-string
+         wizards
+       ];
+       homepage = "http://hledger.org";
+       description = "Command-line interface for the hledger accounting tool";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hledger-api" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, Decimal
+     , docopt, either, hledger, hledger-lib, microlens
+     , microlens-platform, safe, servant-server, servant-swagger
+     , swagger2, text, transformers, wai, wai-extra, warp
+     }:
+     mkDerivation {
+       pname = "hledger-api";
+       version = "1.0";
+       sha256 = "80f4f4eef2c1df68e8013e78a1c5165a0f7c5150f7c4249353698afa078056fd";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson base bytestring containers Decimal docopt either hledger
+         hledger-lib microlens microlens-platform safe servant-server
+         servant-swagger swagger2 text transformers wai wai-extra warp
+       ];
+       homepage = "http://hledger.org";
+       description = "Web API server for the hledger accounting tool";
+       license = "GPL";
+     }) {};
+
   "hledger-chart" = callPackage
     ({ mkDerivation, base, Chart, cmdargs, colour, containers, hledger
      , hledger-lib, HUnit, safe, time
@@ -84477,14 +86478,14 @@ self: {
      }) {};
 
   "hledger-diff" = callPackage
-    ({ mkDerivation, base, hledger-lib, time }:
+    ({ mkDerivation, base, hledger-lib, text, time }:
      mkDerivation {
        pname = "hledger-diff";
-       version = "0.2.0.5";
-       sha256 = "437034c916d99bfc13240e0cc7a563bef4029ddda526eb4bf0e452ef29be8e67";
+       version = "0.2.0.6";
+       sha256 = "0ef38d60055fb632f3a686b5ce8aee0af5637e51b17d4c5a27764dd485c52b75";
        isLibrary = false;
        isExecutable = true;
-       executableHaskellDepends = [ base hledger-lib time ];
+       executableHaskellDepends = [ base hledger-lib text time ];
        homepage = "https://github.com/gebner/hledger-diff";
        description = "Compares the transactions in two ledger files";
        license = stdenv.lib.licenses.gpl3;
@@ -84508,18 +86509,37 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
-  "hledger-irr" = callPackage
-    ({ mkDerivation, base, Cabal, Decimal, hledger-lib, statistics
-     , time
+  "hledger-interest_1_5" = callPackage
+    ({ mkDerivation, base, Cabal, Decimal, hledger-lib, mtl, text, time
      }:
      mkDerivation {
-       pname = "hledger-irr";
-       version = "0.1.1.8";
-       sha256 = "7dd9f5c870c508534c1c00d653ee4319cead5b912a446a8c3b4ef941caae3162";
+       pname = "hledger-interest";
+       version = "1.5";
+       sha256 = "77fb04190160de91eb791f2326691133e1be26c0984fabf30581ba1f0af3fab1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base Cabal Decimal hledger-lib statistics time
+         base Cabal Decimal hledger-lib mtl text time
+       ];
+       homepage = "http://github.com/peti/hledger-interest";
+       description = "computes interest for a given account";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ peti ];
+     }) {};
+
+  "hledger-irr" = callPackage
+    ({ mkDerivation, base, Cabal, Decimal, hledger-lib, statistics
+     , text, time
+     }:
+     mkDerivation {
+       pname = "hledger-irr";
+       version = "0.1.1.9";
+       sha256 = "76266868cb7a1a82483f1f622b3a5f88bc1d2eec8691f264c12761df74147016";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base Cabal Decimal hledger-lib statistics text time
        ];
        description = "computes the internal rate of return of an investment";
        license = stdenv.lib.licenses.bsd3;
@@ -84553,21 +86573,54 @@ self: {
        license = "GPL";
      }) {};
 
+  "hledger-lib_1_0_1" = callPackage
+    ({ mkDerivation, array, base, base-compat, blaze-markup, bytestring
+     , cmdargs, containers, csv, data-default, Decimal, deepseq
+     , directory, doctest, filepath, Glob, HUnit, megaparsec, mtl
+     , mtl-compat, old-time, parsec, pretty-show, regex-tdfa, safe
+     , semigroups, split, test-framework, test-framework-hunit, text
+     , time, transformers, uglymemo, utf8-string
+     }:
+     mkDerivation {
+       pname = "hledger-lib";
+       version = "1.0.1";
+       sha256 = "9a30c51859a4e75a9d3fdd123cb1d13e250f345911ce2b3acefbd921e4248ac6";
+       libraryHaskellDepends = [
+         array base base-compat blaze-markup bytestring cmdargs containers
+         csv data-default Decimal deepseq directory filepath HUnit
+         megaparsec mtl mtl-compat old-time parsec pretty-show regex-tdfa
+         safe semigroups split text time transformers uglymemo utf8-string
+       ];
+       testHaskellDepends = [
+         array base base-compat blaze-markup bytestring cmdargs containers
+         csv data-default Decimal deepseq directory doctest filepath Glob
+         HUnit megaparsec mtl mtl-compat old-time pretty-show regex-tdfa
+         safe split test-framework test-framework-hunit text time
+         transformers uglymemo utf8-string
+       ];
+       homepage = "http://hledger.org";
+       description = "Core data types, parsers and functionality for the hledger accounting tools";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hledger-ui" = callPackage
-    ({ mkDerivation, base, base-compat, brick, cmdargs, containers
-     , data-default, filepath, hledger, hledger-lib, HUnit, lens
-     , pretty-show, safe, split, time, transformers, vector, vty
+    ({ mkDerivation, ansi-terminal, base, base-compat, brick, cmdargs
+     , containers, data-default, filepath, hledger, hledger-lib, HUnit
+     , megaparsec, microlens, microlens-platform, pretty-show, process
+     , safe, split, text, text-zipper, time, transformers, vector, vty
      }:
      mkDerivation {
        pname = "hledger-ui";
-       version = "0.27.5";
-       sha256 = "0864f4b63629681c5db8be6edeff2474ed9407266f8dcb01f7ab2ed77c0ad0d9";
+       version = "1.0.2";
+       sha256 = "0a1ec9ecb14bfe6726cc7d27a8adf1f4ea198362423a024402975f79f30e2b2c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base base-compat brick cmdargs containers data-default filepath
-         hledger hledger-lib HUnit lens pretty-show safe split time
-         transformers vector vty
+         ansi-terminal base base-compat brick cmdargs containers
+         data-default filepath hledger hledger-lib HUnit megaparsec
+         microlens microlens-platform pretty-show process safe split text
+         text-zipper time transformers vector vty
        ];
        homepage = "http://hledger.org";
        description = "Curses-style user interface for the hledger accounting tool";
@@ -84598,23 +86651,23 @@ self: {
     ({ mkDerivation, base, base-compat, blaze-html, blaze-markup
      , bytestring, clientsession, cmdargs, conduit-extra, data-default
      , directory, filepath, hjsmin, hledger, hledger-lib, hspec
-     , 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, yesod-test
+     , http-client, http-conduit, HUnit, json, megaparsec, mtl, parsec
+     , safe, shakespeare, template-haskell, text, time, transformers
+     , wai, wai-extra, wai-handler-launch, warp, yaml, yesod, yesod-core
+     , yesod-form, yesod-static, yesod-test
      }:
      mkDerivation {
        pname = "hledger-web";
-       version = "0.27";
-       sha256 = "92722fa89b09b9d1fd2f66703083e84e0a03a97b6aea08c9064723d4858df1ef";
+       version = "1.0.1";
+       sha256 = "e552af5e781ecc8e46bc7ff5a17333c739b18b9cbdcdca08840703b0b7cc59f8";
        isLibrary = true;
        isExecutable = true;
        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
-         shakespeare template-haskell text time transformers wai wai-extra
-         wai-handler-launch warp yaml yesod yesod-core yesod-form
+         hledger hledger-lib http-client http-conduit HUnit json megaparsec
+         mtl safe shakespeare template-haskell text time transformers wai
+         wai-extra wai-handler-launch warp yaml yesod yesod-core yesod-form
          yesod-static
        ];
        executableHaskellDepends = [
@@ -84628,9 +86681,9 @@ self: {
        testHaskellDepends = [
          base base-compat blaze-html blaze-markup bytestring clientsession
          cmdargs conduit-extra data-default directory filepath hjsmin
-         hledger hledger-lib hspec 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
+         hledger hledger-lib hspec http-client http-conduit HUnit json safe
+         shakespeare template-haskell text time transformers wai wai-extra
+         wai-handler-launch warp yaml yesod yesod-core yesod-form
          yesod-static yesod-test
        ];
        homepage = "http://hledger.org";
@@ -85345,8 +87398,8 @@ self: {
      }:
      mkDerivation {
        pname = "hnix";
-       version = "0.3.3";
-       sha256 = "8c14d3e86b3b2a0e9834ade0f2c3595a96b27d1cc114873887a84f6ed8bee44f";
+       version = "0.3.4";
+       sha256 = "ec890845cc8a782ff8a2e7a2dcbaf763d5ddb3ff202293f701828d04a85adbf2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -87270,6 +89323,38 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hpio_0_8_0_4" = callPackage
+    ({ mkDerivation, async, base, base-compat, bytestring, containers
+     , directory, doctest, exceptions, filepath, hlint, hspec, mtl
+     , mtl-compat, optparse-applicative, QuickCheck, text, transformers
+     , transformers-compat, unix, unix-bytestring
+     }:
+     mkDerivation {
+       pname = "hpio";
+       version = "0.8.0.4";
+       sha256 = "68a97e2a83f2b21143e96ee607726bcf23251ce36bff901bdc60024bb3fbe4f3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base-compat bytestring containers directory exceptions
+         filepath mtl mtl-compat QuickCheck text transformers
+         transformers-compat unix unix-bytestring
+       ];
+       executableHaskellDepends = [
+         async base base-compat exceptions mtl mtl-compat
+         optparse-applicative transformers transformers-compat
+       ];
+       testHaskellDepends = [
+         async base base-compat bytestring containers directory doctest
+         exceptions filepath hlint hspec mtl mtl-compat QuickCheck text
+         transformers transformers-compat unix unix-bytestring
+       ];
+       homepage = "https://github.com/dhess/hpio";
+       description = "Monads for GPIO in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hplayground" = callPackage
     ({ mkDerivation, base, containers, data-default, haste-compiler
      , haste-perch, monads-tf, transformers
@@ -87627,6 +89712,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hreader-lens" = callPackage
+    ({ mkDerivation, base, hreader, hset, lens, profunctors }:
+     mkDerivation {
+       pname = "hreader-lens";
+       version = "0.1.1.0";
+       sha256 = "3b4cef769b0589e042c65876ebd343eb3a00d5ed449b8c6678604ac8b755d647";
+       libraryHaskellDepends = [ base hreader hset lens profunctors ];
+       homepage = "http://github.com/dredozubov/hreader-lens";
+       description = "Optics for hreader package";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hricket" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -87660,7 +89757,7 @@ self: {
        ];
        description = "Embed a Ruby intepreter in your Haskell program !";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "x86_64-linux" ];
      }) {inherit (pkgs) ruby;};
 
   "hs-GeoIP" = callPackage
@@ -89222,25 +91319,6 @@ self: {
      }) {};
 
   "hsexif" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, hspec, HUnit
-     , iconv, text, time
-     }:
-     mkDerivation {
-       pname = "hsexif";
-       version = "0.6.0.9";
-       sha256 = "411c9ff2fc0a0c4bbb28691085887a0f7ebffd2d2c589df763b1104135adc404";
-       libraryHaskellDepends = [
-         base binary bytestring containers iconv text time
-       ];
-       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;
-     }) {};
-
-  "hsexif_0_6_0_10" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, hspec, HUnit
      , iconv, text, time
      }:
@@ -89257,7 +91335,6 @@ self: {
        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
@@ -89547,8 +91624,8 @@ self: {
      }:
      mkDerivation {
        pname = "hslogger-reader";
-       version = "1.0.1";
-       sha256 = "61d0b5f870ef3b5a436ad7e89a2f97ecd4c2bdd3b65998ffe4c71480313dc148";
+       version = "1.0.2";
+       sha256 = "b41559e1f35f0fa38dde62c79c408aaf7452bdb347c726041db67914f83c204f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ attoparsec base hslogger text time ];
@@ -91705,8 +93782,8 @@ self: {
      }:
      mkDerivation {
        pname = "html-tokenizer";
-       version = "0.4.0.0";
-       sha256 = "8767075be6ce5efbec5cd27fdd5efa21fdf16546730789e08861429078978428";
+       version = "0.4.1";
+       sha256 = "1076a72985763dec5d5da3793ae3e4c11cc5c8993b56a31b60f192eee0ed17c1";
        libraryHaskellDepends = [
          attoparsec base-prelude case-insensitive conversion
          conversion-case-insensitive conversion-text text
@@ -91928,7 +94005,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "http-api-data_0_3_1" = callPackage
+  "http-api-data_0_3_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, doctest
      , filepath, hashable, hspec, HUnit, QuickCheck
      , quickcheck-instances, text, time, time-locale-compat
@@ -91936,8 +94013,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-api-data";
-       version = "0.3.1";
-       sha256 = "d5ab6897aae064ac8278fff3b4ce3289446990735f71798b4815cf0eb6ad94c7";
+       version = "0.3.2";
+       sha256 = "015fb4167f807c31af465cd8991454c3ed72ad5935ff0839993f4fcb038958f2";
        libraryHaskellDepends = [
          base bytestring containers hashable text time time-locale-compat
          unordered-containers uri-bytestring uuid-types
@@ -91995,7 +94072,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "http-client_0_5_3_2" = callPackage
+  "http-client_0_5_3_3" = callPackage
     ({ mkDerivation, array, async, base, base64-bytestring
      , blaze-builder, bytestring, case-insensitive, containers, cookie
      , deepseq, directory, exceptions, filepath, ghc-prim, hspec
@@ -92004,8 +94081,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-client";
-       version = "0.5.3.2";
-       sha256 = "cda16be6802d2b65b410090225e5143e4516527e4732b3664dd416297aef5292";
+       version = "0.5.3.3";
+       sha256 = "8faeb55e45f578c9aa7a17dab5a6cb4aa858fb8d64a18c18497c3af4569164ce";
        libraryHaskellDepends = [
          array base base64-bytestring blaze-builder bytestring
          case-insensitive containers cookie deepseq exceptions filepath
@@ -92576,8 +94653,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-pony-transformer-http";
-       version = "0.1.0.2";
-       sha256 = "67671bdaf54937aa21054be059910748db9b736cf2d56146825e09d9a1dd67fe";
+       version = "0.1.0.3";
+       sha256 = "b5e19a0a77ede213c89524609ef401c6d8d5c0c4350a3aae1d161d9c1e294fdd";
        libraryHaskellDepends = [
          attoparsec base bytestring pipes pipes-attoparsec transformers
        ];
@@ -92652,8 +94729,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-response-decoder";
-       version = "0.2.2";
-       sha256 = "9769eec587a8b17450d6b0cda30c57e043cc595fb6f3d7f58a0a8e372299b513";
+       version = "0.2.3";
+       sha256 = "4e0f0ac43f33b811ef8b35715f207318034625547259f8b65c1566702a909f31";
        libraryHaskellDepends = [
          base base-prelude bytestring bytestring-tree-builder
          case-insensitive http-client http-types matcher profunctors text
@@ -92691,6 +94768,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "http-reverse-proxy_0_4_3_2" = callPackage
+    ({ mkDerivation, async, base, blaze-builder, bytestring
+     , case-insensitive, conduit, conduit-extra, containers
+     , data-default-class, hspec, http-client, http-conduit, http-types
+     , lifted-base, monad-control, network, resourcet, streaming-commons
+     , text, transformers, wai, wai-logger, warp, word8
+     }:
+     mkDerivation {
+       pname = "http-reverse-proxy";
+       version = "0.4.3.2";
+       sha256 = "c2b3300bf43a9810e8642dd7fa44ecfb5e0ce1055dc01e0b604ae9a99fbfd77a";
+       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
+       ];
+       testHaskellDepends = [
+         base blaze-builder bytestring conduit conduit-extra hspec
+         http-conduit http-types lifted-base network resourcet
+         streaming-commons transformers wai warp
+       ];
+       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 = stdenv.lib.platforms.none;
+     }) {};
+
   "http-server" = callPackage
     ({ mkDerivation, base, HTTP, mime, network, network-uri, text, unix
      , url, utf8-string
@@ -93158,8 +95263,8 @@ self: {
     ({ mkDerivation, base, dejafu, exceptions, HUnit }:
      mkDerivation {
        pname = "hunit-dejafu";
-       version = "0.3.0.2";
-       sha256 = "eba6ff1b350a7b4a1e09abfc694d4c3ac47bbc36fea23439f512a763c531a7a3";
+       version = "0.3.0.3";
+       sha256 = "c9adfd6bd611e296c4e78b67d23d73cdec71cadd0f876be9a508ce5dc414b120";
        libraryHaskellDepends = [ base dejafu exceptions HUnit ];
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Deja Fu support for the HUnit test framework";
@@ -93445,6 +95550,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hw-balancedparens" = callPackage
+    ({ mkDerivation, base, hspec, hw-bits, hw-excess, hw-prim
+     , hw-rankselect-base, QuickCheck, vector
+     }:
+     mkDerivation {
+       pname = "hw-balancedparens";
+       version = "0.1.0.0";
+       sha256 = "c56ec15ed8f59afa54289362cf936564535843ea8f7ef9758093fd0a438169fe";
+       libraryHaskellDepends = [
+         base hw-bits hw-excess hw-prim hw-rankselect-base vector
+       ];
+       testHaskellDepends = [
+         base hspec hw-bits hw-prim hw-rankselect-base QuickCheck vector
+       ];
+       homepage = "http://github.com/haskell-works/hw-balancedparens#readme";
+       description = "Balanced parentheses";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hw-bits" = callPackage
     ({ mkDerivation, base, bytestring, criterion, hspec, hw-prim, mmap
      , parsec, QuickCheck, resourcet, safe, vector
@@ -93470,28 +95594,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hw-bits_0_3_0_0" = callPackage
-    ({ mkDerivation, base, bytestring, criterion, hspec, hw-prim
-     , hw-string-parse, mmap, QuickCheck, resourcet, safe, vector
+  "hw-bits_0_5_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, hspec, hw-int, hw-prim
+     , hw-string-parse, QuickCheck, safe, vector
      }:
      mkDerivation {
        pname = "hw-bits";
-       version = "0.3.0.0";
-       sha256 = "86195b35765604cead092fdb27a48852b1d587d672646721aab9d4d8e6696251";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.5.0.0";
+       sha256 = "414f2603df8291564eb86edf445cb6a0945143e9ea49faedfc5aa99e950a235f";
        libraryHaskellDepends = [
-         base bytestring hw-prim hw-string-parse safe vector
-       ];
-       executableHaskellDepends = [
-         base criterion mmap resourcet vector
+         base bytestring hw-int hw-prim hw-string-parse safe vector
        ];
        testHaskellDepends = [
          base bytestring hspec hw-prim QuickCheck vector
        ];
        homepage = "http://github.com/haskell-works/hw-bits#readme";
-       description = "Conduits for tokenizing streams";
-       license = stdenv.lib.licenses.mit;
+       description = "Bit manipulation";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -93516,6 +95635,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hw-conduit_0_1_0_0" = callPackage
+    ({ mkDerivation, array, base, bytestring, conduit, criterion, hspec
+     , hw-bits, resourcet, word8
+     }:
+     mkDerivation {
+       pname = "hw-conduit";
+       version = "0.1.0.0";
+       sha256 = "28bc7f865c5366b442743143fa5d5af9cd970bbd2acc549d27993ea49901491b";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base bytestring conduit hw-bits resourcet word8
+       ];
+       executableHaskellDepends = [ base criterion ];
+       testHaskellDepends = [ base bytestring hspec ];
+       homepage = "http://github.com/haskell-works/hw-conduit#readme";
+       description = "Conduits for tokenizing streams";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hw-diagnostics" = callPackage
     ({ mkDerivation, base, hspec, QuickCheck }:
      mkDerivation {
@@ -93532,39 +95672,136 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hw-diagnostics_0_0_0_5" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "hw-diagnostics";
+       version = "0.0.0.5";
+       sha256 = "5ceaec01c446c5a507e889f514201e4739ea6f1cc22a4c68894bb023257bd931";
+       libraryHaskellDepends = [ base ];
+       homepage = "http://github.com/haskell-works/hw-diagnostics#readme";
+       description = "Diagnostics library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hw-eliasfano" = callPackage
+    ({ mkDerivation, base, hspec, hw-bits, hw-int, hw-packed-vector
+     , hw-prim, QuickCheck, safe, vector
+     }:
+     mkDerivation {
+       pname = "hw-eliasfano";
+       version = "0.1.0.1";
+       sha256 = "14710bcbfe4e44bfe683fa0db73d9546268c24101770968c13083defca2048e6";
+       libraryHaskellDepends = [
+         base hw-bits hw-int hw-packed-vector hw-prim safe vector
+       ];
+       testHaskellDepends = [
+         base hspec hw-bits hw-int hw-prim QuickCheck vector
+       ];
+       homepage = "http://github.com/haskell-works/hw-eliasfano#readme";
+       description = "Elias-Fano";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "hw-excess" = callPackage
+    ({ mkDerivation, base, hspec, hw-bits, hw-prim, hw-rankselect-base
+     , QuickCheck, safe, vector
+     }:
+     mkDerivation {
+       pname = "hw-excess";
+       version = "0.1.0.0";
+       sha256 = "4df4b44ec9c0ac60f11f1e9baf1aed39691dc214855980ab5d778a0a6f1742bb";
+       libraryHaskellDepends = [
+         base hw-bits hw-prim hw-rankselect-base safe vector
+       ];
+       testHaskellDepends = [
+         base hspec hw-bits hw-prim QuickCheck vector
+       ];
+       homepage = "http://github.com/haskell-works/hw-excess#readme";
+       description = "Excess";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "hw-int" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "hw-int";
+       version = "0.0.0.1";
+       sha256 = "2f0759f63a77640a61300a2bb292518adca8782e7d099db4804bffac2d2da7cb";
+       libraryHaskellDepends = [ base ];
+       homepage = "http://github.com/haskell-works/hw-int#readme";
+       description = "Integers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hw-json" = callPackage
     ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base
-     , bytestring, conduit, containers, criterion, errors, hspec
-     , hw-bits, hw-conduit, hw-diagnostics, hw-parser, hw-prim
-     , hw-rankselect, mmap, mono-traversable, parsec, QuickCheck
-     , resourcet, text, transformers, vector, word8
+     , bytestring, conduit, containers, criterion, dlist, hspec
+     , hw-balancedparens, hw-bits, hw-conduit, hw-diagnostics, hw-mquery
+     , hw-parser, hw-prim, hw-rankselect, hw-rankselect-base, mmap
+     , mono-traversable, parsec, QuickCheck, resourcet, text
+     , transformers, vector, word8
      }:
      mkDerivation {
        pname = "hw-json";
-       version = "0.2.0.4";
-       sha256 = "771c33414a125d75417a546aa7a9e26210541407460da61294fa3a0e05a22eed";
+       version = "0.4.0.0";
+       sha256 = "addf66d70ee97249797e4967161f52cad0fe4c2cd1c426f51d349b0cbf31cc85";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          ansi-wl-pprint array attoparsec base bytestring conduit containers
-         hw-bits hw-conduit hw-diagnostics hw-parser hw-prim hw-rankselect
-         mmap mono-traversable resourcet text vector word8
+         dlist hw-balancedparens hw-bits hw-conduit hw-diagnostics hw-mquery
+         hw-parser hw-prim hw-rankselect hw-rankselect-base mmap
+         mono-traversable resourcet text vector word8
        ];
        executableHaskellDepends = [
-         base bytestring conduit criterion errors hw-bits hw-conduit
-         hw-diagnostics hw-prim hw-rankselect mmap resourcet vector
+         ansi-wl-pprint array attoparsec base bytestring conduit containers
+         criterion dlist hw-balancedparens hw-bits hw-conduit hw-diagnostics
+         hw-mquery hw-parser hw-prim hw-rankselect hw-rankselect-base mmap
+         mono-traversable resourcet text vector word8
        ];
        testHaskellDepends = [
-         attoparsec base bytestring conduit containers hspec hw-bits
-         hw-conduit hw-prim hw-rankselect mmap parsec QuickCheck resourcet
-         transformers vector
+         attoparsec base bytestring conduit containers hspec
+         hw-balancedparens hw-bits hw-conduit hw-prim hw-rankselect
+         hw-rankselect-base mmap parsec QuickCheck resourcet transformers
+         vector
        ];
        homepage = "http://github.com/haskell-works/hw-json#readme";
-       description = "Conduits for tokenizing streams";
+       description = "Memory efficient JSON parser";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hw-json-lens" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base
+     , bytestring, conduit, containers, dlist, hspec, hw-balancedparens
+     , hw-bits, hw-conduit, hw-diagnostics, hw-json, hw-parser, hw-prim
+     , hw-rankselect, lens, mmap, mono-traversable, parsec, QuickCheck
+     , resourcet, scientific, text, transformers, unordered-containers
+     , vector, word8
+     }:
+     mkDerivation {
+       pname = "hw-json-lens";
+       version = "0.0.0.1";
+       sha256 = "5f14595e525ddc73f564acc702d5828c639b0d23f06a421dde75ab7084100fe4";
+       libraryHaskellDepends = [
+         ansi-wl-pprint array attoparsec base bytestring conduit containers
+         dlist hw-balancedparens hw-bits hw-conduit hw-diagnostics hw-json
+         hw-parser hw-prim hw-rankselect lens mmap mono-traversable
+         resourcet scientific text unordered-containers vector word8
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring conduit containers hspec
+         hw-balancedparens hw-bits hw-conduit hw-json hw-prim hw-rankselect
+         lens mmap parsec QuickCheck resourcet scientific transformers
+         unordered-containers vector
+       ];
+       homepage = "http://github.com/haskell-works/hw-json-lens#readme";
+       description = "Lens for hw-json";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hw-mquery" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, dlist, hspec, QuickCheck }:
      mkDerivation {
@@ -93581,6 +95818,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hw-packed-vector" = callPackage
+    ({ mkDerivation, base, bytestring, hspec, hw-bits, hw-int, hw-prim
+     , hw-string-parse, QuickCheck, safe, vector
+     }:
+     mkDerivation {
+       pname = "hw-packed-vector";
+       version = "0.0.0.1";
+       sha256 = "b6980a80cb23cd6e889a4bb6302f684a158c9d81d7b80873812ea6b3c6014931";
+       libraryHaskellDepends = [
+         base bytestring hw-bits hw-int hw-prim hw-string-parse safe vector
+       ];
+       testHaskellDepends = [
+         base bytestring hspec hw-bits hw-prim QuickCheck vector
+       ];
+       homepage = "http://github.com/haskell-works/hw-packed-vector#readme";
+       description = "Packed Vector";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hw-parser" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, hw-prim
      , mono-traversable, text
@@ -93617,24 +95873,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hw-prim_0_3_0_4" = callPackage
-    ({ mkDerivation, base, bytestring, hspec, QuickCheck, random
-     , vector
-     }:
+  "hw-prim_0_4_0_2" = callPackage
+    ({ mkDerivation, base, bytestring, hspec, QuickCheck, vector }:
      mkDerivation {
        pname = "hw-prim";
-       version = "0.3.0.4";
-       sha256 = "7ca79714de0458c5506fc5b73a5c7a6702beed53a8cb484cd0287ae49d7ffb40";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.4.0.2";
+       sha256 = "1702b32260020864157ccf118151012ca6856bf4618238032cd2f6d9b70a672a";
        libraryHaskellDepends = [ base bytestring vector ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base bytestring hspec QuickCheck random vector
-       ];
+       testHaskellDepends = [ base bytestring hspec QuickCheck vector ];
        homepage = "http://github.com/haskell-works/hw-prim#readme";
        description = "Primitive functions and data types";
-       license = stdenv.lib.licenses.mit;
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -93658,17 +95907,56 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hw-rankselect_0_8_0_0" = callPackage
+    ({ mkDerivation, base, hspec, hw-balancedparens, hw-bits, hw-prim
+     , hw-rankselect-base, QuickCheck, vector
+     }:
+     mkDerivation {
+       pname = "hw-rankselect";
+       version = "0.8.0.0";
+       sha256 = "db85437b77a44d887522b0019af08c8132c6132b5eaa9a2ebb0e4310b6ebaab5";
+       libraryHaskellDepends = [
+         base hw-balancedparens hw-bits hw-prim hw-rankselect-base vector
+       ];
+       testHaskellDepends = [
+         base hspec hw-bits hw-prim hw-rankselect-base QuickCheck vector
+       ];
+       homepage = "http://github.com/haskell-works/hw-rankselect#readme";
+       description = "Rank-select";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hw-rankselect-base" = callPackage
+    ({ mkDerivation, base, hspec, hw-bits, hw-int, hw-prim
+     , hw-string-parse, QuickCheck, safe, vector
+     }:
+     mkDerivation {
+       pname = "hw-rankselect-base";
+       version = "0.2.0.0";
+       sha256 = "c853c19e0f3a7a388a0f315db36843d9e05bb986f6183641b7a04fe16f28afa4";
+       libraryHaskellDepends = [
+         base hw-bits hw-int hw-prim hw-string-parse safe vector
+       ];
+       testHaskellDepends = [
+         base hspec hw-bits hw-prim QuickCheck vector
+       ];
+       homepage = "http://github.com/haskell-works/hw-rankselect-base#readme";
+       description = "Rank-select base";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hw-string-parse" = callPackage
     ({ mkDerivation, base, bytestring, hspec, QuickCheck, vector }:
      mkDerivation {
        pname = "hw-string-parse";
-       version = "0.0.0.2";
-       sha256 = "2b915afcc3ef29a61b17e7a37c047059bf87eb0d22d0f970892292b959ed562e";
+       version = "0.0.0.3";
+       sha256 = "6f5898c63b0b1e0fe7f7d8825f00a728904eba18eefc1353fc72d88a3aabee0a";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base bytestring hspec QuickCheck vector ];
        homepage = "http://github.com/haskell-works/hw-string-parse#readme";
-       description = "Conduits for tokenizing streams";
-       license = stdenv.lib.licenses.mit;
+       description = "String parser";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "hw-succinct" = callPackage
@@ -93690,6 +95978,77 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hw-succinct_0_1_0_1" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, conduit, containers
+     , hw-balancedparens, hw-bits, hw-prim, hw-rankselect
+     , hw-rankselect-base, mmap, mono-traversable, text, vector, word8
+     }:
+     mkDerivation {
+       pname = "hw-succinct";
+       version = "0.1.0.1";
+       sha256 = "002c578c1ff7a33cbef089b2a943218777c14125629f6bf63dea9e7c8e3749db";
+       libraryHaskellDepends = [
+         attoparsec base bytestring conduit containers hw-balancedparens
+         hw-bits hw-prim hw-rankselect hw-rankselect-base mmap
+         mono-traversable text vector word8
+       ];
+       homepage = "http://github.com/haskell-works/hw-succinct#readme";
+       description = "Succint datastructures";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hw-vector" = callPackage
+    ({ mkDerivation, base, bytestring, hspec, hw-prim, QuickCheck
+     , vector
+     }:
+     mkDerivation {
+       pname = "hw-vector";
+       version = "0.0.0.1";
+       sha256 = "0381d90756d46dc2aff60ce122a128234a7ab23d2285c37bf775b4a03d1ab074";
+       libraryHaskellDepends = [ base bytestring hw-prim vector ];
+       testHaskellDepends = [ base hspec QuickCheck vector ];
+       homepage = "http://github.com/haskell-works/hw-vector#readme";
+       description = "Vector type with convenient typeclass instances";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "hw-xml" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base
+     , bytestring, conduit, containers, criterion, hspec
+     , hw-balancedparens, hw-bits, hw-conduit, hw-diagnostics, hw-parser
+     , hw-prim, hw-rankselect, hw-rankselect-base, mmap
+     , mono-traversable, parsec, QuickCheck, resourcet, text
+     , transformers, vector, word8
+     }:
+     mkDerivation {
+       pname = "hw-xml";
+       version = "0.0.0.1";
+       sha256 = "79ff61e2ea455ca08924e223a9285b016af8e16b216dd25f039709eac4846a15";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-wl-pprint array attoparsec base bytestring conduit containers
+         hw-balancedparens hw-bits hw-conduit hw-parser hw-prim
+         hw-rankselect hw-rankselect-base mono-traversable resourcet text
+         vector word8
+       ];
+       executableHaskellDepends = [
+         base bytestring conduit criterion hw-balancedparens hw-bits
+         hw-conduit hw-diagnostics hw-prim hw-rankselect mmap resourcet
+         vector
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring conduit containers hspec
+         hw-balancedparens hw-bits hw-conduit hw-prim hw-rankselect
+         hw-rankselect-base mmap parsec QuickCheck resourcet transformers
+         vector
+       ];
+       homepage = "http://github.com/haskell-works/hw-xml#readme";
+       description = "Conduits for tokenizing streams";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hwall-auth-iitk" = callPackage
     ({ mkDerivation, base, bytestring, haskeline, http-conduit
      , http-types, mtl, regex-compat, unix
@@ -93890,25 +96249,6 @@ self: {
      }) {};
 
   "hxt" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, deepseq
-     , directory, filepath, HUnit, hxt-charproperties
-     , hxt-regex-xmlschema, hxt-unicode, mtl, network-uri, parsec
-     }:
-     mkDerivation {
-       pname = "hxt";
-       version = "9.3.1.15";
-       sha256 = "723e7b3c22f58771087e7763d11702b3ae3aa910158a2beee70e973722966560";
-       libraryHaskellDepends = [
-         base binary bytestring containers deepseq directory filepath HUnit
-         hxt-charproperties hxt-regex-xmlschema hxt-unicode mtl network-uri
-         parsec
-       ];
-       homepage = "https://github.com/UweSchmidt/hxt";
-       description = "A collection of tools for processing XML with Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hxt_9_3_1_16" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, deepseq
      , directory, filepath, hxt-charproperties, hxt-regex-xmlschema
      , hxt-unicode, mtl, network-uri, parsec
@@ -93925,7 +96265,6 @@ self: {
        homepage = "https://github.com/UweSchmidt/hxt";
        description = "A collection of tools for processing XML with Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hxt-binary" = callPackage
@@ -94071,23 +96410,6 @@ self: {
      }) {};
 
   "hxt-regex-xmlschema" = callPackage
-    ({ mkDerivation, base, bytestring, HUnit, hxt-charproperties
-     , parsec, text
-     }:
-     mkDerivation {
-       pname = "hxt-regex-xmlschema";
-       version = "9.2.0.2";
-       sha256 = "4744676dde2b29c4bb75a579345145225a1f1b7ba15d46b7f868c37c6e696cc2";
-       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;
-     }) {};
-
-  "hxt-regex-xmlschema_9_2_0_3" = callPackage
     ({ mkDerivation, base, bytestring, HUnit, hxt-charproperties
      , parsec, text
      }:
@@ -94102,7 +96424,6 @@ self: {
        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;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hxt-relaxng" = callPackage
@@ -94521,8 +96842,8 @@ self: {
      }:
      mkDerivation {
        pname = "hylide";
-       version = "0.1.4.0";
-       sha256 = "23887424cba4466f674bddc88ba65e751a690d4455469075de617f5c0595da3b";
+       version = "0.1.4.1";
+       sha256 = "e0c98883073da1513757698c2c70cee419db20e351127e83c31e01239c66a94e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base hylogen vector-space ];
@@ -94531,7 +96852,7 @@ self: {
          process text wai warp websockets
        ];
        homepage = "https://github.com/sleexyz/hylide";
-       description = "Livecoding WebGL renderer for Hylogen";
+       description = "WebGL renderer for livecoding shaders with Hylogen";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -95009,6 +97330,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "iconv-typed" = callPackage
+    ({ mkDerivation, base, bytestring, iconv, shelly, template-haskell
+     , text
+     }:
+     mkDerivation {
+       pname = "iconv-typed";
+       version = "0.2.0.0";
+       sha256 = "3d43bb14e87d77ffbe2bfe9d5d8de7df8c83561eb46ca834a2086a27b090a2a8";
+       libraryHaskellDepends = [
+         base bytestring iconv shelly template-haskell text
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/adinapoli/iconv-typed#readme";
+       description = "Type safe iconv wrapper";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ide-backend" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring
      , bytestring-trie, Cabal-ide-backend, containers, crypto-api
@@ -95178,6 +97516,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "identicon_0_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, hspec, JuicyPixels }:
+     mkDerivation {
+       pname = "identicon";
+       version = "0.2.0";
+       sha256 = "c9d22c41893f50ac6c096c11ac037f91153cd3b324c76bcbdd3277b2761cb346";
+       libraryHaskellDepends = [ base bytestring JuicyPixels ];
+       testHaskellDepends = [ base bytestring hspec JuicyPixels ];
+       homepage = "https://github.com/mrkkrp/identicon";
+       description = "Flexible generation of identicons";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "identifiers" = callPackage
     ({ mkDerivation, base, binary, cereal, containers, deepseq
      , hashable, ListLike, QuickCheck, test-framework
@@ -96038,6 +98390,41 @@ self: {
        license = "unknown";
      }) {};
 
+  "imm_1_1_0_0" = callPackage
+    ({ mkDerivation, aeson, ansi-wl-pprint, atom-conduit, base
+     , blaze-html, blaze-markup, bytestring, case-insensitive
+     , chunked-data, comonad, conduit, conduit-combinators, connection
+     , containers, directory, dyre, fast-logger, filepath, free
+     , hashable, HaskellNet, HaskellNet-SSL, http-client
+     , http-client-tls, http-types, mime-mail, mono-traversable
+     , monoid-subclasses, network, opml-conduit, optparse-applicative
+     , rainbow, rainbox, rss-conduit, safe-exceptions, tagged, text
+     , time, timerep, tls, transformers, uri-bytestring, xml
+     , xml-conduit
+     }:
+     mkDerivation {
+       pname = "imm";
+       version = "1.1.0.0";
+       sha256 = "528437eaca7d756d2c0787504018f532a4ea531f97b5401e58161f9bd6c03f56";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-wl-pprint atom-conduit base blaze-html blaze-markup
+         bytestring case-insensitive chunked-data comonad conduit
+         conduit-combinators connection containers directory dyre
+         fast-logger filepath free hashable HaskellNet HaskellNet-SSL
+         http-client http-client-tls http-types mime-mail mono-traversable
+         monoid-subclasses network opml-conduit optparse-applicative rainbow
+         rainbox rss-conduit safe-exceptions tagged text time timerep tls
+         transformers uri-bytestring xml xml-conduit
+       ];
+       executableHaskellDepends = [ base free ];
+       homepage = "https://github.com/k0ral/imm";
+       description = "Execute arbitrary actions for each unread element of RSS/Atom feeds";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "immortal" = callPackage
     ({ mkDerivation, base, lifted-base, monad-control, stm, tasty
      , tasty-hunit, transformers, transformers-base
@@ -96902,23 +99289,26 @@ self: {
 
   "inline-java" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers
-     , distributed-closure, inline-c, jvm, singletons, text
-     , thread-local-storage, vector
+     , distributed-closure, filepath, ghc-heap-view, hspec, inline-c
+     , jni, jvm, language-java, monad-loops, process, singletons, syb
+     , template-haskell, temporary, text, thread-local-storage, vector
      }:
      mkDerivation {
        pname = "inline-java";
-       version = "0.1";
-       sha256 = "ec4a751af5749b1b12dd9fd20ae40745f0410375024bd895293d52b8386f5dcb";
+       version = "0.5.1";
+       sha256 = "b134f3a7904da62a23118bffe7f42bee1ea0c6fa4b84216679609520faeea098";
        libraryHaskellDepends = [
-         base binary bytestring containers distributed-closure inline-c
-         singletons text thread-local-storage vector
+         base binary bytestring containers distributed-closure filepath
+         ghc-heap-view inline-c jni jvm language-java monad-loops process
+         singletons syb template-haskell temporary text thread-local-storage
+         vector
        ];
-       librarySystemDepends = [ jvm ];
+       testHaskellDepends = [ base bytestring hspec jvm singletons text ];
        homepage = "http://github.com/tweag/inline-java#readme";
        description = "Java interop via inline Java code in Haskell modules";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {jvm = null;};
+     }) {};
 
   "inline-r" = callPackage
     ({ mkDerivation, aeson, base, bytestring, c2hs, containers
@@ -97418,6 +99808,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "intero_0_1_19" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, directory
+     , filepath, ghc, ghc-boot-th, ghc-paths, ghci, haskeline, hspec
+     , process, regex-compat, syb, temporary, time, transformers, unix
+     }:
+     mkDerivation {
+       pname = "intero";
+       version = "0.1.19";
+       sha256 = "77dbd2811296b7b6a57a2d90d59580ea6d0d13f7611528233e020978408521ad";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         array base bytestring containers directory filepath ghc ghc-boot-th
+         ghc-paths ghci haskeline process syb time transformers unix
+       ];
+       testHaskellDepends = [
+         base directory hspec process regex-compat temporary transformers
+       ];
+       homepage = "https://github.com/commercialhaskell/intero";
+       description = "Complete interactive development program for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "interpol" = callPackage
     ({ mkDerivation, base, haskell-src-exts, HUnit, regex-posix, syb
      , test-framework, test-framework-hunit
@@ -98023,20 +100437,6 @@ self: {
      }) {};
 
   "ip6addr" = callPackage
-    ({ mkDerivation, base, cmdargs, IPv6Addr, text }:
-     mkDerivation {
-       pname = "ip6addr";
-       version = "0.5.1.3";
-       sha256 = "4edd17f9cf77b0e6ae59c9016d5dc72b3467959bd779264783a4fe7c02aa9340";
-       isLibrary = false;
-       isExecutable = true;
-       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;
-     }) {};
-
-  "ip6addr_0_5_1_4" = callPackage
     ({ mkDerivation, base, cmdargs, IPv6Addr, text }:
      mkDerivation {
        pname = "ip6addr";
@@ -98048,7 +100448,6 @@ self: {
        homepage = "https://github.com/MichelBoucey/ip6addr";
        description = "Commandline tool to generate IPv6 address text representations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ipatch" = callPackage
@@ -98264,6 +100663,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "irc-client_0_4_4_1" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, connection, irc-conduit
+     , irc-ctcp, network-conduit-tls, old-locale, stm, stm-conduit, text
+     , time, tls, transformers, x509, x509-store, x509-validation
+     }:
+     mkDerivation {
+       pname = "irc-client";
+       version = "0.4.4.1";
+       sha256 = "38d105cd429eb4937be8e5586c3ae268d420ce927894940670993abcc863ecf6";
+       libraryHaskellDepends = [
+         base bytestring conduit connection irc-conduit irc-ctcp
+         network-conduit-tls old-locale stm stm-conduit text time tls
+         transformers x509 x509-store x509-validation
+       ];
+       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
     ({ mkDerivation, base, text }:
      mkDerivation {
@@ -98293,6 +100712,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "irc-conduit_0_2_1_1" = callPackage
+    ({ mkDerivation, async, base, bytestring, conduit, conduit-extra
+     , connection, irc, irc-ctcp, network-conduit-tls, text, time, tls
+     , transformers, x509-validation
+     }:
+     mkDerivation {
+       pname = "irc-conduit";
+       version = "0.2.1.1";
+       sha256 = "ae575fcb8f8b2e1450387cad47fbae00d4f48f16238e656867678fd344ead51b";
+       libraryHaskellDepends = [
+         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 = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "irc-core" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, hashable, HUnit
      , memory, primitive, text, time, vector
@@ -99755,6 +102193,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "jni" = callPackage
+    ({ mkDerivation, base, bytestring, containers, inline-c, jvm
+     , singletons, thread-local-storage
+     }:
+     mkDerivation {
+       pname = "jni";
+       version = "0.1";
+       sha256 = "1e9545909b89552fb3c65ae6454a40912bf31f2a66fe0d3dcbadfc2af21c255b";
+       libraryHaskellDepends = [
+         base bytestring containers inline-c singletons thread-local-storage
+       ];
+       librarySystemDepends = [ jvm ];
+       homepage = "https://github.com/tweag/inline-java/tree/master/jni#readme";
+       description = "Complete JNI raw bindings";
+       license = stdenv.lib.licenses.bsd3;
+     }) {jvm = null;};
+
   "jobqueue" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, bytestring
      , containers, data-default, directory, fast-logger, HDBC
@@ -100005,8 +102460,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsaddle-dom";
-       version = "0.5.0.0";
-       sha256 = "7edcda4cc112e983651be34824cf44109685e93360157b68f618ff05a7601c73";
+       version = "0.5.0.1";
+       sha256 = "fb64e3a7924c6191e39f61845fec44acc14502b5d70e6ec3b8fd12dbadb9904a";
        libraryHaskellDepends = [
          base base-compat jsaddle lens text transformers
        ];
@@ -100237,6 +102692,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "json-bytes-builder" = callPackage
+    ({ mkDerivation, base, base-prelude, bytestring, scientific
+     , semigroups, text
+     }:
+     mkDerivation {
+       pname = "json-bytes-builder";
+       version = "0.4";
+       sha256 = "f4f6084ee679640c97a62e0bf108fc7526fab7d69e786c881281c94e416e2e97";
+       libraryHaskellDepends = [
+         base base-prelude bytestring scientific semigroups text
+       ];
+       homepage = "https://github.com/nikita-volkov/json-bytes-builder";
+       description = "Direct-to-bytes JSON Builder";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "json-encoder" = callPackage
     ({ mkDerivation, base, base-prelude, bytestring
      , bytestring-tree-builder, contravariant, contravariant-extras
@@ -100952,6 +103423,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "jvm" = callPackage
+    ({ mkDerivation, base, bytestring, distributed-closure, hspec, jni
+     , singletons, text, vector
+     }:
+     mkDerivation {
+       pname = "jvm";
+       version = "0.1.2";
+       sha256 = "0d20fc48b951e3decaa96e9ec13b60d4d45213b54d0f41323340fec1c27e2136";
+       libraryHaskellDepends = [
+         base bytestring distributed-closure jni singletons text vector
+       ];
+       testHaskellDepends = [ base bytestring hspec text ];
+       homepage = "http://github.com/tweag/inline-java/tree/master/jvm#readme";
+       description = "Call JVM methods from Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "jvm-parser" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , data-binary-ieee754, fgl, fingertree, pretty, zlib
@@ -101960,29 +104448,28 @@ self: {
 
   "keysafe" = callPackage
     ({ mkDerivation, aeson, argon2, async, base, binary, bloomfilter
-     , bytestring, containers, crypto-random, deepseq, directory
-     , disk-free-space, exceptions, fast-logger, filepath, http-client
-     , lifted-base, MonadRandom, network, optparse-applicative, process
-     , raaz, random, random-shuffle, readline, SafeSemaphore
-     , secret-sharing, servant, servant-client, servant-server, socks
-     , split, stm, text, time, token-bucket, transformers
-     , unbounded-delays, unix, unix-compat, utf8-string, wai, warp
-     , zxcvbn-c
+     , bytestring, containers, deepseq, directory, disk-free-space
+     , exceptions, fast-logger, filepath, http-client, lifted-base
+     , MonadRandom, network, optparse-applicative, process, raaz, random
+     , random-shuffle, readline, SafeSemaphore, secret-sharing, servant
+     , servant-client, servant-server, socks, split, stm, text, time
+     , token-bucket, transformers, unbounded-delays, unix, unix-compat
+     , utf8-string, wai, warp, zxcvbn-c
      }:
      mkDerivation {
        pname = "keysafe";
-       version = "0.20161006";
-       sha256 = "ae5d4445467d7f381a2c8ecd2142d64c31f1697418c5892b2f0e50f1857e034e";
+       version = "0.20161022";
+       sha256 = "2b6cc28f249b18dcdb0263ccb649598ddc8196f449e14130a20b0358711151a1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          aeson argon2 async base binary bloomfilter bytestring containers
-         crypto-random deepseq directory disk-free-space exceptions
-         fast-logger filepath http-client lifted-base MonadRandom network
-         optparse-applicative process raaz random random-shuffle readline
-         SafeSemaphore secret-sharing servant servant-client servant-server
-         socks split stm text time token-bucket transformers
-         unbounded-delays unix unix-compat utf8-string wai warp zxcvbn-c
+         deepseq directory disk-free-space exceptions fast-logger filepath
+         http-client lifted-base MonadRandom network optparse-applicative
+         process raaz random random-shuffle readline SafeSemaphore
+         secret-sharing servant servant-client servant-server socks split
+         stm text time token-bucket transformers unbounded-delays unix
+         unix-compat utf8-string wai warp zxcvbn-c
        ];
        homepage = "https://joeyh.name/code/keysafe/";
        description = "back up a secret key securely to the cloud";
@@ -102742,6 +105229,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "lambda-calculator" = callPackage
+    ({ mkDerivation, base, hspec, HUnit, parsec, Shellac
+     , Shellac-readline
+     }:
+     mkDerivation {
+       pname = "lambda-calculator";
+       version = "0.5.0";
+       sha256 = "b6f3da4fbb70574ad0131b0ca2ff509031eebf17b8ab650c71651b2aedda26a1";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base parsec ];
+       executableHaskellDepends = [ base Shellac Shellac-readline ];
+       testHaskellDepends = [ base hspec HUnit ];
+       homepage = "https://github.com/sgillespie/lambda-calculus#readme";
+       description = "A lambda calculus interpreter";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "lambda-canvas" = callPackage
     ({ mkDerivation, base, GLUT, mtl, OpenGL, time }:
      mkDerivation {
@@ -103645,6 +106150,32 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "language-dockerfile_0_3_5_0" = callPackage
+    ({ mkDerivation, base, bytestring, directory, filepath, free, Glob
+     , hspec, HUnit, mtl, parsec, pretty, process, QuickCheck
+     , ShellCheck, split, template-haskell, test-framework
+     , test-framework-hunit, th-lift, th-lift-instances, transformers
+     }:
+     mkDerivation {
+       pname = "language-dockerfile";
+       version = "0.3.5.0";
+       sha256 = "9667fd70217ebf229369fbaf906bf74926a8ef1651fd965862c47082d09342e5";
+       libraryHaskellDepends = [
+         base bytestring free mtl parsec pretty ShellCheck split
+         template-haskell th-lift th-lift-instances transformers
+       ];
+       testHaskellDepends = [
+         base bytestring directory filepath free Glob hspec HUnit mtl parsec
+         pretty process QuickCheck ShellCheck split template-haskell
+         test-framework test-framework-hunit th-lift th-lift-instances
+         transformers
+       ];
+       homepage = "https://github.com/beijaflor-io/language-dockerfile#readme";
+       description = "Dockerfile linter, parser, pretty-printer and embedded DSL";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "language-dot" = callPackage
     ({ mkDerivation, base, mtl, parsec, pretty }:
      mkDerivation {
@@ -105024,8 +107555,8 @@ self: {
      }:
      mkDerivation {
        pname = "legion";
-       version = "0.5.0.1";
-       sha256 = "2863daa3d874bd257a22b6795c502c4bfe73d3790e200462983d32b5b53999d0";
+       version = "0.6.0.0";
+       sha256 = "dab609f13594fd58d78ac5775d9e1027247d17ef5a29ca319140afa2f05f49d2";
        libraryHaskellDepends = [
          aeson attoparsec base binary binary-conduit bytestring
          canteven-http canteven-log conduit conduit-extra containers
@@ -105090,8 +107621,8 @@ self: {
      }:
      mkDerivation {
        pname = "legion-extra";
-       version = "0.1.0.3";
-       sha256 = "f53bec687bb2a6d878dbc63a7ba90955f6cfa77a99a074bcc7a3ee9d44702a5e";
+       version = "0.1.0.4";
+       sha256 = "6961f3d40eac0bef0a6aa9301e6057ee79bf92ccec82cd6f60957b759dc1c048";
        libraryHaskellDepends = [
          aeson base bytestring canteven-log containers data-default-class
          legion network safe split yaml
@@ -106660,6 +109191,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lightning-haskell" = callPackage
+    ({ mkDerivation, aeson, api-builder, base, blaze-html, bytestring
+     , data-default-class, free, hspec, http-client, http-client-tls
+     , http-types, mtl, network, text, transformers
+     }:
+     mkDerivation {
+       pname = "lightning-haskell";
+       version = "0.1.0.2";
+       sha256 = "f6616270f8a15bc6a1efb5fe3431f97112c6c2a144c0f90f88e9df6a931b04d7";
+       libraryHaskellDepends = [
+         aeson api-builder base blaze-html bytestring data-default-class
+         free http-client http-client-tls http-types mtl network text
+         transformers
+       ];
+       testHaskellDepends = [
+         aeson api-builder base bytestring hspec http-client http-client-tls
+         http-types network text transformers
+       ];
+       homepage = "https://github.com/cmoresid/lightning-haskell#readme";
+       description = "Haskell client for lightning-viz REST API";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "lighttpd-conf" = callPackage
     ({ mkDerivation, alex, array, base, bytestring, happy, packedstring
      , pretty, template-haskell
@@ -107698,8 +110252,8 @@ self: {
      }:
      mkDerivation {
        pname = "list-t-attoparsec";
-       version = "0.4.0.2";
-       sha256 = "614950a96b0f465b6bd084c250f4c399f433e305928305934623237ef129590b";
+       version = "0.4.1";
+       sha256 = "49d74a5f8abd9246566231d8c26ff9d29a2ed91c3ff61ab182de133e7b0bfd44";
        libraryHaskellDepends = [
          attoparsec base-prelude either list-t text transformers
        ];
@@ -107720,8 +110274,8 @@ self: {
      }:
      mkDerivation {
        pname = "list-t-html-parser";
-       version = "0.4.1.1";
-       sha256 = "42f9b2c5e77acfa154a56ac538b29888d943d451487a45a70040d32458c24f27";
+       version = "0.4.2";
+       sha256 = "42bd5a8ad206aeb4ae4934c747164243084392ecdcf40ad5acc05a1760ad5836";
        libraryHaskellDepends = [
          base-prelude case-insensitive conversion
          conversion-case-insensitive conversion-text either html-entities
@@ -107760,8 +110314,8 @@ self: {
      }:
      mkDerivation {
        pname = "list-t-libcurl";
-       version = "0.3.0.0";
-       sha256 = "257b5f7b2121b88e2dcbc18cb70e0d0bdb53e17be412a9638f661e7c50ee8fc1";
+       version = "0.3.1";
+       sha256 = "f0c8aa894d73b5db7a6bfc5dcca9f7a83d43e722df7b1aa6fa485b34e6f8de2d";
        libraryHaskellDepends = [
          base base-prelude bytestring curlhs either list-t mtl-prelude
          resource-pool stm
@@ -107778,8 +110332,8 @@ self: {
      }:
      mkDerivation {
        pname = "list-t-text";
-       version = "0.2.0.2";
-       sha256 = "95e2d3647608d2e8a527f4ab0666a4fe98ed7f67b17e4831fc2e5f59b78e4bc3";
+       version = "0.2.1";
+       sha256 = "697fdc68a95e625ba02ee67737e647645da1da4d244f1ebc74fd3ba13b3d22b0";
        libraryHaskellDepends = [
          base-prelude bytestring list-t mtl-prelude text
        ];
@@ -109962,8 +112516,8 @@ self: {
      }:
      mkDerivation {
        pname = "lzma";
-       version = "0.0.0.2";
-       sha256 = "09b45eb9fd47913c2cd2aa8e1e9544df21b96f24ea21615fde3b681ecde26b9a";
+       version = "0.0.0.3";
+       sha256 = "af8321c3511bde3e2745093fa3bd74c642e386db7d2e7c43b3a54814f1338144";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ lzma ];
        testHaskellDepends = [
@@ -111110,6 +113664,8 @@ self: {
        pname = "map-syntax";
        version = "0.2.0.1";
        sha256 = "f45f0e09da98dc749eae15f403e30674e874c57f81c4bdd8db818028a25b5c55";
+       revision = "1";
+       editedCabalFile = "1e17d3b0d97cd033dd95b227ab387d6c3118a9b3191a290a593542f2ef0c4698";
        libraryHaskellDepends = [ base containers mtl ];
        testHaskellDepends = [
          base containers deepseq hspec HUnit mtl QuickCheck transformers
@@ -112090,6 +114646,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "median-stream" = callPackage
+    ({ mkDerivation, base, heap, QuickCheck }:
+     mkDerivation {
+       pname = "median-stream";
+       version = "0.3.0.0";
+       sha256 = "579c8c60b7376f78e02fa5cdd950c1116198126114c610a3561109d3b2dd2b74";
+       libraryHaskellDepends = [ base heap ];
+       testHaskellDepends = [ base QuickCheck ];
+       homepage = "https://github.com/caneroj1/median-stream#readme";
+       description = "Constant-time queries for the median of a stream of numeric data";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "mediawiki" = callPackage
     ({ mkDerivation, base, HTTP, mime, network, pretty, utf8-string
      , xml
@@ -113740,6 +116309,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "minisat-solver" = callPackage
+    ({ mkDerivation, base, containers, transformers }:
+     mkDerivation {
+       pname = "minisat-solver";
+       version = "0.1";
+       sha256 = "c12098dee034afb98b31ce7ac346398b93a3537c11e30e7573d25160120fd37d";
+       libraryHaskellDepends = [ base containers transformers ];
+       homepage = "http://www.mathstat.dal.ca/~selinger/minisat-solver/";
+       description = "High-level Haskell bindings for the MiniSat SAT solver";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "ministg" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, monads-tf
      , parsec, pretty, transformers, xhtml
@@ -116918,14 +119499,18 @@ self: {
      }) {};
 
   "multifile" = callPackage
-    ({ mkDerivation, base, HaXml }:
+    ({ mkDerivation, base, directory, HaXml, optparse-applicative
+     , pretty
+     }:
      mkDerivation {
        pname = "multifile";
-       version = "0.1.0.0";
-       sha256 = "a0d4e0c033e8f17991fa62be64efd16d04b76befbe74cd84f547fbbdd17bef9d";
+       version = "0.1.0.2";
+       sha256 = "acfcdc40b0ec9a11cd0de2efaa6fb1b4164907b24d3326ea78b5576ee51ac784";
        isLibrary = false;
        isExecutable = true;
-       executableHaskellDepends = [ base HaXml ];
+       executableHaskellDepends = [
+         base directory HaXml optparse-applicative pretty
+       ];
        homepage = "xy30.com";
        description = "create many files from one";
        license = stdenv.lib.licenses.bsd3;
@@ -117770,6 +120355,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "mwc-probability_1_2_2" = callPackage
+    ({ mkDerivation, base, mwc-random, primitive, transformers }:
+     mkDerivation {
+       pname = "mwc-probability";
+       version = "1.2.2";
+       sha256 = "a54e9e9e51c7b67e0eb8244d584fcfc999ab7af00e5146ffdf3efed837d5915a";
+       libraryHaskellDepends = [ base mwc-random primitive transformers ];
+       homepage = "http://github.com/jtobin/mwc-probability";
+       description = "Sampling function-based probability distributions";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mwc-random" = callPackage
     ({ mkDerivation, base, primitive, time, vector }:
      mkDerivation {
@@ -117899,14 +120497,17 @@ self: {
      }) {};
 
   "mysql" = callPackage
-    ({ mkDerivation, base, bytestring, containers, mysql }:
+    ({ mkDerivation, base, bytestring, Cabal, containers, hspec, mysql
+     }:
      mkDerivation {
        pname = "mysql";
-       version = "0.1.1.8";
-       sha256 = "90f02af1c81e2189f65dcef0f78327eba4b0ef40bea5bde5cb74920727f9bd84";
+       version = "0.1.3";
+       sha256 = "282e9dc78d9b0f8f4e99ef7d1cd257a3a41a66a4e890bc6823dade4af6317a0d";
+       setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [ base bytestring containers ];
        librarySystemDepends = [ mysql ];
-       homepage = "https://github.com/bos/mysql";
+       testHaskellDepends = [ base bytestring hspec ];
+       homepage = "https://github.com/paul-rouse/mysql";
        description = "A low-level MySQL client library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -117932,46 +120533,47 @@ self: {
      }) {};
 
   "mysql-haskell" = callPackage
-    ({ mkDerivation, base, binary, blaze-textual, bytestring
-     , bytestring-lexing, cryptonite, HsOpenSSL, io-streams, memory
-     , monad-loops, network, openssl, optparse-applicative, scientific
-     , tasty, tasty-hunit, tcp-streams, text, time, tls, wire-streams
-     , word24
+    ({ mkDerivation, base, binary, binary-ieee754, binary-parsers
+     , blaze-textual, bytestring, bytestring-lexing, cryptonite
+     , HsOpenSSL, io-streams, memory, monad-loops, network
+     , optparse-applicative, scientific, tasty, tasty-hunit, tcp-streams
+     , text, time, tls, vector, wire-streams, word24
      }:
      mkDerivation {
        pname = "mysql-haskell";
-       version = "0.5.0.0";
-       sha256 = "90441f149ae5720c0842cadac775d8bd5f59f7f56c4f297bac19318ce3603258";
+       version = "0.6.0.0";
+       sha256 = "c1d577ccf0f38a1e0c54409c6e2dfc55bc77c88a3a22537679c4a742d5674429";
        libraryHaskellDepends = [
-         base binary blaze-textual bytestring bytestring-lexing cryptonite
-         HsOpenSSL io-streams memory monad-loops network scientific
-         tcp-streams text time tls wire-streams word24
+         base binary binary-ieee754 binary-parsers blaze-textual bytestring
+         bytestring-lexing cryptonite HsOpenSSL io-streams memory
+         monad-loops network scientific tcp-streams text time tls vector
+         wire-streams word24
        ];
-       librarySystemDepends = [ openssl ];
        testHaskellDepends = [
          base bytestring io-streams optparse-applicative tasty tasty-hunit
-         text time
+         text time vector
        ];
        homepage = "https://github.com/winterland1989/mysql-haskell";
        description = "pure haskell MySQL driver";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) openssl;};
+     }) {};
 
   "mysql-simple" = callPackage
     ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder
-     , blaze-textual, bytestring, mysql, old-locale, pcre-light, text
-     , time
+     , blaze-textual, bytestring, hspec, mysql, old-locale, pcre-light
+     , text, time
      }:
      mkDerivation {
        pname = "mysql-simple";
-       version = "0.2.2.5";
-       sha256 = "86a30893c6e0eb0316b52780d6ca0464c7a1e048a50d03d203ecce975f7d518c";
+       version = "0.4.0.0";
+       sha256 = "0f5ce026b8d45016dc90a543b394a72dae25aa115bfa5e7ae0095a516bb9f04d";
        libraryHaskellDepends = [
          attoparsec base base16-bytestring blaze-builder blaze-textual
          bytestring mysql old-locale pcre-light text time
        ];
-       homepage = "https://github.com/bos/mysql-simple";
+       testHaskellDepends = [ base hspec ];
+       homepage = "https://github.com/paul-rouse/mysql-simple";
        description = "A mid-level MySQL client library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -118039,8 +120641,8 @@ self: {
      }:
      mkDerivation {
        pname = "mywatch";
-       version = "0.2.0";
-       sha256 = "1276a8f25aab080e7765f277af8567f7b1a411f1716228fd658557e7236a7144";
+       version = "0.2.1";
+       sha256 = "f0cf3ba9a265b60e02feb118bfab66810f188bd34414a7d6a9be6318644d21fa";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -119265,8 +121867,8 @@ self: {
     ({ mkDerivation, base, netwire }:
      mkDerivation {
        pname = "netwire-input";
-       version = "0.0.4";
-       sha256 = "06821950dd44925e208f740d747675ab42a51f0cf1b7eb0b5ed10566df670db8";
+       version = "0.0.6";
+       sha256 = "4a04c52371358471eaef127ed37547ec35fe58bef2cd6b22ce8b1074fb0db88e";
        libraryHaskellDepends = [ base netwire ];
        homepage = "https://www.github.com/Mokosha/netwire-input";
        description = "Input handling abstractions for netwire";
@@ -119279,8 +121881,8 @@ self: {
      }:
      mkDerivation {
        pname = "netwire-input-glfw";
-       version = "0.0.4";
-       sha256 = "8fb6ba62fe7b122d204ff8af390de98a1631af370b231d4a4e5e57b0166a7298";
+       version = "0.0.6";
+       sha256 = "dd095cf915005ca6d72fa75a1ea7d890e2cdde2b8f16f45a994e413e97d9dd06";
        libraryHaskellDepends = [
          base containers GLFW-b mtl netwire-input stm
        ];
@@ -119307,6 +121909,27 @@ self: {
        broken = true;
      }) {ghcjs-base = null;};
 
+  "netwire-vinylglfw-examples" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, directory
+     , filepath, GLFW-b, GLUtil, lens, linear, mtl, netwire
+     , netwire-input, netwire-input-glfw, OpenGL, transformers, vinyl
+     , vinyl-gl
+     }:
+     mkDerivation {
+       pname = "netwire-vinylglfw-examples";
+       version = "1.0.0";
+       sha256 = "c99688b25885c0148cf274182c51a9376e4aafb7c3dd99a22fe1b85d2f1dc09a";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         array base bytestring containers directory filepath GLFW-b GLUtil
+         lens linear mtl netwire netwire-input netwire-input-glfw OpenGL
+         transformers vinyl vinyl-gl
+       ];
+       description = "Netwire/GLFW/VinylGL input handling demo";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "network" = callPackage
     ({ mkDerivation, base, bytestring, doctest, HUnit, test-framework
      , test-framework-hunit, unix
@@ -120204,8 +122827,8 @@ self: {
        pname = "networked-game";
        version = "0.1.0.1";
        sha256 = "dfaa45c867596131bcd454390a95171f71bd38baf63300b9c75567fcd8495e8b";
-       revision = "1";
-       editedCabalFile = "01590db1085c70805c76e7f752dfa741336d1647cb6c7cee46f361c83c67a99d";
+       revision = "2";
+       editedCabalFile = "3cffaedec9a17f0faad461fc0e7ecfc342d36644071ed59f06ce9ce0044bce2e";
        libraryHaskellDepends = [
          base binary bytestring containers network time transformers
        ];
@@ -120334,10 +122957,8 @@ self: {
     ({ mkDerivation, base, hspec, HUnit }:
      mkDerivation {
        pname = "newtype-generics";
-       version = "0.4.1";
-       sha256 = "a5ed63130601fa2f97b105adeced7e691ee7924bcfd3f7da6605495f7a655fe2";
-       revision = "1";
-       editedCabalFile = "75d1f6c129b225524a80de19734b5477f45c63a185258954d59f4da5e6a35873";
+       version = "0.5";
+       sha256 = "dc63ac2c9e682ee292a8f88fa3eb1af1b66d5860f7dcec0d09319c5ef96e7f9c";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec HUnit ];
        description = "A typeclass and set of functions for working with newtypes, with generics support";
@@ -120434,8 +123055,8 @@ self: {
     ({ mkDerivation, async, base, bytestring, template-haskell, unix }:
      mkDerivation {
        pname = "ngx-export";
-       version = "0.2.1.0";
-       sha256 = "877cdac98af15734ceb0fef6d4096a48a78c40e20fceabc0d9dd15811a2e760f";
+       version = "0.2.2.0";
+       sha256 = "d9d97e8b1f7ce0dd3c183dabe9b1856e4c0594617a1da5a22e34782648deadef";
        libraryHaskellDepends = [
          async base bytestring template-haskell unix
        ];
@@ -121790,8 +124411,8 @@ self: {
      }:
      mkDerivation {
        pname = "obd";
-       version = "0.1.0.0";
-       sha256 = "99625705214cc2b4d0445a138fbdcd2f47beadfcc31aeedb4cde282127ed5cd1";
+       version = "0.2.1.1";
+       sha256 = "38478d38d59aa39603023f93733b00df17d105f91d94f94182e753721c65ec3d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -121799,7 +124420,8 @@ self: {
          split stm stm-chans transformers
        ];
        executableHaskellDepends = [
-         base bytestring haskeline mtl optparse-applicative transformers
+         base bytestring haskeline lens mtl optparse-applicative
+         transformers
        ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/hverr/haskell-obd#readme";
@@ -122260,10 +124882,8 @@ self: {
      }:
      mkDerivation {
        pname = "ombra";
-       version = "0.1.0.0";
-       sha256 = "2d89e1b8630c71973aa69c2aa8ea7c52367705f4661d37b8f68528c9377def93";
-       revision = "1";
-       editedCabalFile = "ce10c9b1257110bbfec5edbd403abe27e43dfa7a7cdf7d62890530a5ace21376";
+       version = "0.1.1.0";
+       sha256 = "d23a834bfd3195eadc37e9f8b443dfec9b2d223bec8ab1e7eecfb1278055de72";
        libraryHaskellDepends = [
          base gl hashable hashtables transformers unordered-containers vect
          vector
@@ -122716,8 +125336,8 @@ self: {
     ({ mkDerivation, atomspace-cwrapper, base, transformers }:
      mkDerivation {
        pname = "opencog-atomspace";
-       version = "0.1.0.4";
-       sha256 = "86d9371d31722da33abb7ca7690e064f87e0d772622d4b798c23f8b8cee5e52e";
+       version = "0.1.0.6";
+       sha256 = "2925f1fe014f33e003558db6692354b12368ee9fcad835f669470b74b9daab1a";
        libraryHaskellDepends = [ base transformers ];
        librarySystemDepends = [ atomspace-cwrapper ];
        homepage = "github.com/opencog/atomspace/tree/master/opencog/haskell";
@@ -123266,10 +125886,8 @@ self: {
     ({ mkDerivation, base, mtl, random }:
      mkDerivation {
        pname = "operational";
-       version = "0.2.3.3";
-       sha256 = "25489ee5475e5dd8bc5fb415a0189ef6f7e84253f4e392ff5f40b3c3ff1e406c";
-       revision = "1";
-       editedCabalFile = "5a688a78ec908382a5bfebd425340268ef6b53f5985ca7d13a54aeffa86c079b";
+       version = "0.2.3.4";
+       sha256 = "51cc8751432201f4cbef15a187ee668bca13d774eb0ef28c8e3d36f633866810";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mtl ];
@@ -124194,8 +126812,8 @@ self: {
      }:
      mkDerivation {
        pname = "packdeps";
-       version = "0.4.2.1";
-       sha256 = "468fd8d83023865bb240c5b8fd5615501ffb2dcced9eaa2f15d22502d208c85c";
+       version = "0.4.3";
+       sha256 = "a8d4bd6ab9158d7fcd2ef4070b6a4c9196755f36bd9b5c8345bb7d76c6f1116b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -124564,39 +127182,40 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
-  "pandoc_1_17_2" = callPackage
+  "pandoc_1_18" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, array, base
      , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
      , cmark, containers, data-default, deepseq, Diff, directory
-     , executable-path, extensible-exceptions, filemanip, filepath
-     , ghc-prim, haddock-library, highlighting-kate, hslua, HTTP
-     , http-client, http-client-tls, http-types, HUnit, JuicyPixels, mtl
-     , network, network-uri, old-time, pandoc-types, parsec, process
-     , QuickCheck, random, scientific, SHA, syb, tagsoup, temporary
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , texmath, text, time, unordered-containers, vector, xml, yaml
-     , zip-archive, zlib
+     , doctemplates, executable-path, extensible-exceptions, filemanip
+     , filepath, ghc-prim, haddock-library, highlighting-kate, hslua
+     , HTTP, http-client, http-client-tls, http-types, HUnit
+     , JuicyPixels, mtl, network, network-uri, old-time, pandoc-types
+     , parsec, process, QuickCheck, random, scientific, SHA, syb
+     , tagsoup, temporary, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, texmath, text, time, unix
+     , unordered-containers, vector, xml, yaml, zip-archive, zlib
      }:
      mkDerivation {
        pname = "pandoc";
-       version = "1.17.2";
-       sha256 = "81727d054dfb26de816ea59ed541ebaf60d66d440012c12ec02f9c2b02fee8ec";
+       version = "1.18";
+       sha256 = "3ea4b977f31d71dedd99a4584a895659efbbab02b00fdc9daaf7781787ce4e92";
        configureFlags = [ "-fhttps" "-f-trypandoc" ];
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson array base base64-bytestring binary blaze-html blaze-markup
          bytestring cmark containers data-default deepseq directory
-         extensible-exceptions filemanip filepath ghc-prim 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
+         doctemplates extensible-exceptions filemanip filepath ghc-prim
+         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
        ];
        executableHaskellDepends = [
          aeson base bytestring containers directory extensible-exceptions
          filepath highlighting-kate HTTP network network-uri pandoc-types
-         text yaml
+         text unix yaml
        ];
        testHaskellDepends = [
          ansi-terminal base bytestring containers Diff directory
@@ -124645,6 +127264,40 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pandoc-citeproc_0_10_2_2" = callPackage
+    ({ mkDerivation, 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
+     , unordered-containers, vector, xml-conduit, yaml
+     }:
+     mkDerivation {
+       pname = "pandoc-citeproc";
+       version = "0.10.2.2";
+       sha256 = "1475a2e0a13922df9c931c0480154fa4f02bd81ef34b166596b035898c94dd7a";
+       isLibrary = true;
+       isExecutable = true;
+       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 unordered-containers vector
+         xml-conduit yaml
+       ];
+       executableHaskellDepends = [
+         aeson aeson-pretty attoparsec base bytestring filepath pandoc
+         pandoc-types syb text yaml
+       ];
+       testHaskellDepends = [
+         aeson base bytestring directory filepath pandoc pandoc-types
+         process temporary text yaml
+       ];
+       doCheck = false;
+       homepage = "https://github.com/jgm/pandoc-citeproc";
+       description = "Supports using pandoc with citeproc";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pandoc-citeproc-preamble" = callPackage
     ({ mkDerivation, base, directory, filepath, pandoc-types, process
      }:
@@ -124769,8 +127422,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-placetable";
-       version = "0.4";
-       sha256 = "e7f6e9cf7da0c49e00f47fdddd50ec80d1adb24dbe5f05faaa0682d27fe607e0";
+       version = "0.4.1";
+       sha256 = "8c1e03f5bd538301eda3c5b83b594693638b805b6fead191a10d9b73a7c18383";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -125342,8 +127995,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "pareto";
-       version = "0.1.0.0";
-       sha256 = "edc54861e89b3f4b36f4c1be63e424adbe4a2068ed6c5c8fefeb61c9d387a3dd";
+       version = "0.2.0.0";
+       sha256 = "c0126578a4cef2349a4df6f12900a6a27cedf04039a2f7b4fa0c863d58fe052c";
        libraryHaskellDepends = [ base ];
        homepage = "http://bitbucket.org/hyllos/pareto-haskell";
        description = "A library for cause-effect relationships";
@@ -125795,6 +128448,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "partial-handler_1_0_2" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "partial-handler";
+       version = "1.0.2";
+       sha256 = "fae9f291f4146631eb3be173299bbc7755343a0e9b74e62ee1921e209a6aa4f1";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/nikita-volkov/partial-handler";
+       description = "A composable exception handler";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "partial-isomorphisms" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -125960,8 +128626,8 @@ self: {
      }:
      mkDerivation {
        pname = "patat";
-       version = "0.3.0.0";
-       sha256 = "898abcb5b2eda94e9943cde4605e7594d3b1be04fdb477e7ac0560f8139c3d18";
+       version = "0.3.2.0";
+       sha256 = "be251bdd996fe8bc89dfe95fb86d9abeda2cd6b6b6044a7ab79900f6c8d27e0b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -127288,6 +129954,8 @@ self: {
        pname = "persistent-mysql";
        version = "2.6";
        sha256 = "a34c9f34feab49af156870a4c09df98d9cda54a3dd08944e3e0d326e86993be7";
+       revision = "2";
+       editedCabalFile = "58089479bffd093a76438ed244837a885f9b0a78fa814c92d3a6aad86ed3d206";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring conduit containers
          monad-control monad-logger mysql mysql-simple persistent
@@ -127769,8 +130437,8 @@ self: {
      }:
      mkDerivation {
        pname = "pgdl";
-       version = "10.0";
-       sha256 = "be71f949ba02b8ef5b094527346a9a9202cf2e50f2801cac0f70aa5ee57458c3";
+       version = "10.2";
+       sha256 = "8b27c1af6318c385027b1fa89c7459a0cbb274383148ec1d434c16cf8111216a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -128845,22 +131513,6 @@ self: {
      }) {};
 
   "pipes-extras" = callPackage
-    ({ mkDerivation, base, foldl, HUnit, pipes, test-framework
-     , test-framework-hunit, transformers
-     }:
-     mkDerivation {
-       pname = "pipes-extras";
-       version = "1.0.5";
-       sha256 = "5250cb5da34d3d880e129e6294c19d2fab6747e9dab3446d93a01b579a0c78aa";
-       libraryHaskellDepends = [ base foldl pipes transformers ];
-       testHaskellDepends = [
-         base HUnit pipes test-framework test-framework-hunit transformers
-       ];
-       description = "Extra utilities for pipes";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pipes-extras_1_0_7" = callPackage
     ({ mkDerivation, base, foldl, HUnit, pipes, test-framework
      , test-framework-hunit, transformers
      }:
@@ -128874,7 +131526,6 @@ self: {
        ];
        description = "Extra utilities for pipes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-fastx" = callPackage
@@ -128970,12 +131621,12 @@ self: {
      }) {};
 
   "pipes-interleave" = callPackage
-    ({ mkDerivation, base, containers, pipes }:
+    ({ mkDerivation, base, containers, heaps, pipes }:
      mkDerivation {
        pname = "pipes-interleave";
-       version = "0.2.2";
-       sha256 = "31427ee2c164449fa3119dfc08bd6912f0287bcac74c9c811755a9c716c21d4a";
-       libraryHaskellDepends = [ base containers pipes ];
+       version = "1.1.0";
+       sha256 = "bd083ec1cc9f35ee393763b18581835d8124b358480ae91c6473308af642d8c4";
+       libraryHaskellDepends = [ base containers heaps pipes ];
        homepage = "http://github.com/bgamari/pipes-interleave";
        description = "Interleave and merge streams of elements";
        license = stdenv.lib.licenses.bsd3;
@@ -129913,8 +132564,8 @@ self: {
      }:
      mkDerivation {
        pname = "ply-loader";
-       version = "0.4.1";
-       sha256 = "e1e16f2451f9be85cdc684e57854ef1f626e353e847dca2854cd6ff988152342";
+       version = "0.4.2";
+       sha256 = "60adbcb9323fd221b70ed106b9c418636112e989b3364a2eb0227fefce47afaf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -130472,8 +133123,8 @@ self: {
     ({ mkDerivation, base, containers, deepseq, polyparse, tagsoup }:
      mkDerivation {
        pname = "polysoup";
-       version = "0.6.2";
-       sha256 = "bdb28b4e47cba223a9c9f3c3454b87e3210cdcd67af2cf570edcd4d8bc84e295";
+       version = "0.6.3";
+       sha256 = "9af6228977d331fe2ad7e8d0d48fd5acffadf3070ea06b503ffb493b7a994f48";
        libraryHaskellDepends = [
          base containers deepseq polyparse tagsoup
        ];
@@ -130788,6 +133439,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "portable-template-haskell-lens" = callPackage
+    ({ mkDerivation, base, lens, template-haskell }:
+     mkDerivation {
+       pname = "portable-template-haskell-lens";
+       version = "0.1.0.0";
+       sha256 = "b81c8c159b168688e38e6965d921d342e393cc5867e6b724eab2d0eadb07af93";
+       libraryHaskellDepends = [ base lens template-haskell ];
+       description = "Lenses for the AST of Template Haskell 2.11 and Template Haskell < 2.11";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "portaudio" = callPackage
     ({ mkDerivation, base, containers, portaudio }:
      mkDerivation {
@@ -131155,8 +133817,8 @@ self: {
      }:
      mkDerivation {
        pname = "postgresql-orm";
-       version = "0.4.1";
-       sha256 = "649d995c7eb7890b2826cda2d930651a0906e9ce0173342180d83e5527dc7b5a";
+       version = "0.5.0";
+       sha256 = "5e5892c081bd462671f6af8399c1300fae3c14c03af66b7d65370aa4c12faf4f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -131299,6 +133961,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "postgresql-simple-opts" = callPackage
+    ({ mkDerivation, base, bytestring, hspec, markdown-unlit
+     , optparse-applicative, optparse-generic, postgresql-simple
+     }:
+     mkDerivation {
+       pname = "postgresql-simple-opts";
+       version = "0.1.0.4";
+       sha256 = "e404a87d6e51bf7ed9318cc86a14e09d4229545d70d5b991762a080b404260e5";
+       libraryHaskellDepends = [
+         base bytestring markdown-unlit optparse-applicative
+         optparse-generic postgresql-simple
+       ];
+       testHaskellDepends = [
+         base bytestring hspec optparse-applicative postgresql-simple
+       ];
+       homepage = "https://github.com/jfischoff/postgresql-simple-opts#readme";
+       description = "An optparse-applicative parser for postgresql-simple's connection options";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "postgresql-simple-sop" = callPackage
     ({ mkDerivation, base, generics-sop, postgresql-simple }:
      mkDerivation {
@@ -131708,6 +134390,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "precursor" = callPackage
+    ({ mkDerivation, base, bifunctors, bytestring, containers, doctest
+     , mtl, QuickCheck, text, text-show
+     }:
+     mkDerivation {
+       pname = "precursor";
+       version = "0.1.0.0";
+       sha256 = "34b17a44555d8c18ed0ebf6633e5d5da03d10c23acd3f085452d5cc5dfe65861";
+       libraryHaskellDepends = [
+         base bifunctors bytestring containers mtl text text-show
+       ];
+       testHaskellDepends = [ base doctest QuickCheck ];
+       homepage = "https://github.com/oisdk/precursor#readme";
+       description = "Prelude replacement";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "pred-set" = callPackage
     ({ mkDerivation, base, hashable, hashtables, HSet }:
      mkDerivation {
@@ -132925,6 +135624,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "profiteur_0_3_0_3" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, filepath
+     , text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "profiteur";
+       version = "0.3.0.3";
+       sha256 = "4f9929059826c24be4c4cbfae00cfea5985c20c4c2ddb03d56a47cd72c18e144";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson attoparsec base bytestring filepath text unordered-containers
+         vector
+       ];
+       homepage = "http://github.com/jaspervdj/profiteur";
+       description = "Treemap visualiser for GHC prof files";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "profunctor-extras" = callPackage
     ({ mkDerivation, base, profunctors }:
      mkDerivation {
@@ -133167,8 +135886,8 @@ self: {
      }:
      mkDerivation {
        pname = "prometheus";
-       version = "0.4.0";
-       sha256 = "ec0f31a99e223e31db093af5e62225a723f1f709b859cfa5137e713d3c4e0fe8";
+       version = "0.4.1";
+       sha256 = "3a32953351a2829e6bb0bf5fd30654ce703397e5e65ffb8665fa367eff7277bb";
        libraryHaskellDepends = [
          atomic-primops base bytestring containers http-types text
          transformers wai warp
@@ -134282,23 +137001,24 @@ self: {
      }) {};
 
   "pure-zlib" = callPackage
-    ({ mkDerivation, base, bytestring, containers, fingertree, HUnit
-     , monadLib, QuickCheck, test-framework, test-framework-hunit
-     , test-framework-quickcheck2
+    ({ mkDerivation, base, base-compat, bytestring, bytestring-builder
+     , containers, filepath, fingertree, HUnit, monadLib, QuickCheck
+     , tasty, tasty-hunit, tasty-quickcheck
      }:
      mkDerivation {
        pname = "pure-zlib";
-       version = "0.4";
-       sha256 = "0a9722791fb96fadec325b2e5b1e1f8c1a2ebedd53d0b7db5e6ec84eaf6cd3c1";
+       version = "0.5";
+       sha256 = "b7cf6e9d02c9ab7d246651b4a49696448dd35cbd2146ace84ff4a9ea5afc30ab";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring containers fingertree monadLib
+         base base-compat bytestring bytestring-builder containers
+         fingertree monadLib
        ];
-       executableHaskellDepends = [ base bytestring ];
+       executableHaskellDepends = [ base base-compat bytestring ];
        testHaskellDepends = [
-         base bytestring HUnit QuickCheck test-framework
-         test-framework-hunit test-framework-quickcheck2
+         base base-compat bytestring filepath HUnit QuickCheck tasty
+         tasty-hunit tasty-quickcheck
        ];
        homepage = "http://github.com/GaloisInc/pure-zlib";
        description = "A Haskell-only implementation of zlib / DEFLATE";
@@ -135282,6 +138002,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "quickbench" = callPackage
+    ({ mkDerivation, base, containers, directory, docopt, pretty-show
+     , process, safe, split, tabular, time
+     }:
+     mkDerivation {
+       pname = "quickbench";
+       version = "1.0";
+       sha256 = "8bfe252e50a683346e753db312e9542f8d43256947ab215fcfd24af03787b926";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers directory docopt pretty-show process safe split
+         tabular time
+       ];
+       executableHaskellDepends = [ base process ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/simonmichael/quickbench#readme";
+       description = "quick & easy benchmarking of command-line programs";
+       license = "GPL";
+     }) {};
+
   "quickbooks" = callPackage
     ({ mkDerivation, aeson, authenticate-oauth, base, bytestring
      , email-validate, fast-logger, http-client, http-client-tls
@@ -135363,20 +138104,6 @@ self: {
      }) {};
 
   "quickcheck-io" = callPackage
-    ({ mkDerivation, base, HUnit, QuickCheck }:
-     mkDerivation {
-       pname = "quickcheck-io";
-       version = "0.1.3";
-       sha256 = "d798584e26c51e4cbb0dadd1097cf14472c917240d09fc3d9a2b74961673c8b4";
-       revision = "1";
-       editedCabalFile = "9c0af3d194aa2d469c4cde8e26ad6566af32685face8ddb17919960f424c357a";
-       libraryHaskellDepends = [ base HUnit QuickCheck ];
-       homepage = "https://github.com/hspec/quickcheck-io#readme";
-       description = "Use HUnit assertions as QuickCheck properties";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "quickcheck-io_0_1_4" = callPackage
     ({ mkDerivation, base, HUnit, QuickCheck }:
      mkDerivation {
        pname = "quickcheck-io";
@@ -135386,7 +138113,6 @@ self: {
        homepage = "https://github.com/hspec/quickcheck-io#readme";
        description = "Use HUnit assertions as QuickCheck properties";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickcheck-poly" = callPackage
@@ -135491,6 +138217,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "quickcheck-report" = callPackage
+    ({ mkDerivation, base, lens, QuickCheck, template-haskell
+     , th-printf
+     }:
+     mkDerivation {
+       pname = "quickcheck-report";
+       version = "0.1.0.0";
+       sha256 = "34c50e79d89b21b79b52d0392ad4d7dab451cef0dd720ab35a44f99781124b5c";
+       libraryHaskellDepends = [
+         base lens QuickCheck template-haskell th-printf
+       ];
+       description = "Customizable reports for quickcheck properties";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "quickcheck-script" = callPackage
     ({ mkDerivation, base, directory, process, QuickCheck }:
      mkDerivation {
@@ -136667,6 +139408,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "rasterific-svg_0_3_2" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, directory
+     , filepath, FontyFruity, JuicyPixels, lens, linear, mtl
+     , optparse-applicative, primitive, Rasterific, scientific, svg-tree
+     , text, transformers, vector
+     }:
+     mkDerivation {
+       pname = "rasterific-svg";
+       version = "0.3.2";
+       sha256 = "ab43e8e6d2800f88becc1c619691ce7b2b63f35ce6007a904c5119b8c1711d23";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bytestring containers directory filepath FontyFruity
+         JuicyPixels lens linear mtl primitive Rasterific scientific
+         svg-tree text transformers vector
+       ];
+       executableHaskellDepends = [
+         base bytestring directory filepath FontyFruity JuicyPixels
+         optparse-applicative Rasterific svg-tree
+       ];
+       description = "SVG renderer based on Rasterific";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rate-limit" = callPackage
     ({ mkDerivation, base, time-units }:
      mkDerivation {
@@ -136726,6 +139493,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "rattletrap" = callPackage
+    ({ mkDerivation, aeson, aeson-casing, base, bimap, binary
+     , binary-bits, bytestring, containers, data-binary-ieee754
+     , filepath, hlint, regex-compat, tasty, tasty-hspec
+     , template-haskell, text, vector
+     }:
+     mkDerivation {
+       pname = "rattletrap";
+       version = "0.1.0";
+       sha256 = "4a2b0ca12153d467d09c623a09a497028346f8838cbb0ce45c333f812539cfe9";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bimap binary binary-bits bytestring containers
+         data-binary-ieee754 regex-compat text vector
+       ];
+       executableHaskellDepends = [
+         aeson aeson-casing base binary bytestring template-haskell
+       ];
+       testHaskellDepends = [
+         base binary bytestring filepath hlint tasty tasty-hspec
+       ];
+       description = "Parse and generate Rocket League replays";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "raven-haskell" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hspec, http-conduit
      , network, random, text, time, unordered-containers, uuid
@@ -137585,8 +140378,8 @@ self: {
      }:
      mkDerivation {
        pname = "rebase";
-       version = "1";
-       sha256 = "cb4338a1993a7ef39c35c022f848d964151e2b1a05834f5f3deb2f68efbfd79a";
+       version = "1.0.2.1";
+       sha256 = "beae3eb88c71e817ebfde0b16ce17875f33cefc1371c3e4c72f5a5feb1c2a69e";
        libraryHaskellDepends = [
          base base-prelude bifunctors bytestring containers contravariant
          contravariant-extras deepseq dlist either fail hashable mtl
@@ -137616,8 +140409,8 @@ self: {
      }:
      mkDerivation {
        pname = "record";
-       version = "0.4.1.1";
-       sha256 = "efb51262d06872cc7881b000842e46fd593468a4e6823e80cf0c0d58196b2d96";
+       version = "0.4.2";
+       sha256 = "beac089c7fdca32bf4f577b04ffbc4ddfbd12e85dd4c05d4906fba299f167276";
        libraryHaskellDepends = [
          base base-prelude basic-lens template-haskell transformers
        ];
@@ -137675,8 +140468,8 @@ self: {
      }:
      mkDerivation {
        pname = "record-preprocessor";
-       version = "0.1.0.3";
-       sha256 = "7e64e05e5769c6c48e699701c45c2004af68f7187d6096fdbee95122a790d16d";
+       version = "0.1.1.1";
+       sha256 = "b0cb4a1da915964c6f70300c1fbe9fcc5c2d559ebc82f1ad57ef09dee1cbe55e";
        isLibrary = true;
        isExecutable = true;
        executableHaskellDepends = [
@@ -137696,8 +140489,8 @@ self: {
      }:
      mkDerivation {
        pname = "record-syntax";
-       version = "0.1.0.2";
-       sha256 = "6798aa9a4fdc0ade9dd608efa42ea4d716a2c0bdbc28491d5577fb0224f0ff9c";
+       version = "0.1.1";
+       sha256 = "a574878bb9fe14f65f1a5616cc27d9b317f0697df3140c8c27d51be1c55efe97";
        libraryHaskellDepends = [
          base base-prelude conversion conversion-text haskell-src-exts
          parsec record template-haskell text transformers
@@ -139255,29 +142048,6 @@ self: {
      }) {};
 
   "relational-query" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, dlist
-     , names-th, persistable-record, quickcheck-simple, sql-words
-     , template-haskell, text, th-reify-compat, time, time-locale-compat
-     , transformers
-     }:
-     mkDerivation {
-       pname = "relational-query";
-       version = "0.8.3.1";
-       sha256 = "58451604364d41e9ec1db6ab80064485a24b20917bc979e0de6fab71ec0c8375";
-       libraryHaskellDepends = [
-         array base bytestring containers dlist names-th persistable-record
-         sql-words template-haskell text th-reify-compat time
-         time-locale-compat 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;
-     }) {};
-
-  "relational-query_0_8_3_2" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, dlist
      , names-th, persistable-record, quickcheck-simple, sql-words
      , template-haskell, text, th-reify-compat, time, time-locale-compat
@@ -139298,7 +142068,6 @@ self: {
        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
@@ -144690,6 +147459,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "sdl2-gfx" = callPackage
+    ({ mkDerivation, base, bytestring, lifted-base, linear
+     , monad-control, SDL2, sdl2, SDL2_gfx, template-haskell, text
+     , transformers, vector
+     }:
+     mkDerivation {
+       pname = "sdl2-gfx";
+       version = "0.2";
+       sha256 = "8c1e10b7a675d782cd650820c75c4ef9225718ad6aaa3f8db02e869b7720c50d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring lifted-base linear monad-control sdl2
+         template-haskell text transformers vector
+       ];
+       libraryPkgconfigDepends = [ SDL2 SDL2_gfx ];
+       executableHaskellDepends = [ base linear sdl2 vector ];
+       description = "Bindings to SDL2_gfx";
+       license = stdenv.lib.licenses.mit;
+     }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_gfx;};
+
   "sdl2-image" = callPackage
     ({ mkDerivation, base, SDL2, sdl2, SDL2_image }:
      mkDerivation {
@@ -144704,6 +147494,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_image;};
 
+  "sdl2-mixer" = callPackage
+    ({ mkDerivation, base, bytestring, data-default-class, lifted-base
+     , monad-control, sdl2, SDL2_mixer, template-haskell, text
+     , transformers, vector
+     }:
+     mkDerivation {
+       pname = "sdl2-mixer";
+       version = "0.1";
+       sha256 = "d924f31d9e1c87eed92d357ce20273dba44637861927188b8a44db2c0b2e2bc0";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring data-default-class lifted-base monad-control sdl2
+         template-haskell text transformers vector
+       ];
+       librarySystemDepends = [ SDL2_mixer ];
+       libraryPkgconfigDepends = [ SDL2_mixer ];
+       executableHaskellDepends = [ base data-default-class sdl2 vector ];
+       description = "Bindings to SDL2_mixer";
+       license = stdenv.lib.licenses.bsd3;
+     }) {inherit (pkgs) SDL2_mixer;};
+
   "sdl2-ttf" = callPackage
     ({ mkDerivation, base, linear, SDL2, sdl2, SDL2_ttf, transformers
      }:
@@ -145129,6 +147941,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "semdoc" = callPackage
+    ({ mkDerivation, base, containers, data-default-class, ghc
+     , ghc-paths, Glob, groom, mtl, pandoc, pandoc-types, regex-tdfa
+     }:
+     mkDerivation {
+       pname = "semdoc";
+       version = "0.1.1";
+       sha256 = "05a2a838a25125bf8d8cf9f696f3745486e5d1d2c8a778b16c54a746b970882a";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers data-default-class ghc ghc-paths Glob groom mtl
+         pandoc pandoc-types regex-tdfa
+       ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://toktok.github.io/semdoc";
+       description = "Evaluate code snippets in Literate Haskell";
+       license = stdenv.lib.licenses.agpl3;
+     }) {};
+
   "semi-iso" = callPackage
     ({ mkDerivation, base, lens, profunctors, semigroupoids
      , transformers, tuple-morph
@@ -145792,7 +148624,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "servant_0_9_0_1" = callPackage
+  "servant_0_9_1_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
      , case-insensitive, directory, doctest, filemanip, filepath, hspec
      , http-api-data, http-media, http-types, mmorph, mtl, network-uri
@@ -145801,8 +148633,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant";
-       version = "0.9.0.1";
-       sha256 = "997fa97c5e84f6a16ff7ec3390510ae8d83bca4d7680f3427060f6bad7daa34e";
+       version = "0.9.1.1";
+       sha256 = "fb3372f676ab07dfab1695ccd0e23d98c948318f4b4d5ae827a6fa5284c4e5fa";
        libraryHaskellDepends = [
          aeson attoparsec base base-compat bytestring case-insensitive
          http-api-data http-media http-types mmorph mtl network-uri
@@ -146152,27 +148984,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "servant-client_0_9_0_1" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
-     , bytestring, deepseq, exceptions, hspec, http-api-data
-     , http-client, http-client-tls, http-media, http-types, HUnit, mtl
-     , network, network-uri, QuickCheck, safe, servant, servant-server
-     , string-conversions, text, transformers, transformers-compat, wai
-     , warp
+  "servant-client_0_9_1_1" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base-compat
+     , base64-bytestring, bytestring, deepseq, exceptions, hspec
+     , http-api-data, http-client, http-client-tls, http-media
+     , http-types, HUnit, mtl, network, network-uri, QuickCheck, safe
+     , servant, servant-server, string-conversions, text, transformers
+     , transformers-compat, wai, warp
      }:
      mkDerivation {
        pname = "servant-client";
-       version = "0.9.0.1";
-       sha256 = "3d962e54309bf67bea62178873d5840874bc78f58149b9c6c6d9cb6e5a8563e8";
+       version = "0.9.1.1";
+       sha256 = "6e085faa1a8ecab076ffdec61b97b6e7c8fff7eb18a9a4cf3538c26b7b99c724";
        libraryHaskellDepends = [
-         aeson attoparsec base base64-bytestring bytestring exceptions
-         http-api-data http-client http-client-tls http-media http-types mtl
-         network-uri safe servant string-conversions text transformers
-         transformers-compat
+         aeson attoparsec base base-compat base64-bytestring bytestring
+         exceptions http-api-data http-client http-client-tls http-media
+         http-types mtl network-uri safe servant string-conversions text
+         transformers transformers-compat
        ];
        testHaskellDepends = [
-         aeson base bytestring deepseq hspec http-api-data http-client
-         http-media http-types HUnit network QuickCheck servant
+         aeson base base-compat bytestring deepseq hspec http-api-data
+         http-client http-media http-types HUnit network QuickCheck servant
          servant-server text transformers transformers-compat wai warp
        ];
        homepage = "http://haskell-servant.readthedocs.org/";
@@ -146266,7 +149098,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "servant-docs_0_9_0_1" = callPackage
+  "servant-docs_0_9_1_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring
      , case-insensitive, control-monad-omega, hashable, hspec
      , http-media, http-types, lens, servant, string-conversions, text
@@ -146274,8 +149106,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-docs";
-       version = "0.9.0.1";
-       sha256 = "a93955e71706421dcd82a6f7aafb0d599cd736c09b065bd4cad26159c6aac54e";
+       version = "0.9.1.1";
+       sha256 = "7c4205d25caa926355221e62842c3e58337d05022b1e4341045ac385e568bc79";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -146375,12 +149207,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "servant-foreign_0_9_0_1" = callPackage
+  "servant-foreign_0_9_1_1" = callPackage
     ({ mkDerivation, base, hspec, http-types, lens, servant, text }:
      mkDerivation {
        pname = "servant-foreign";
-       version = "0.9.0.1";
-       sha256 = "133429124fa786185b2511150cf8b50779b1c23d41cd3d624877f1d40757c8a5";
+       version = "0.9.1.1";
+       sha256 = "da9baf46c97b3ef3009a69c8d1ca40e188409c0027490c9e173b9ebd3da7c9ca";
        libraryHaskellDepends = [ base http-types lens servant text ];
        testHaskellDepends = [ base hspec ];
        description = "Helpers for generating clients for servant APIs in any programming language";
@@ -146540,17 +149372,19 @@ self: {
 
   "servant-matrix-param" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, doctest
-     , hspec, http-types, servant, servant-aeson-specs, servant-server
-     , text, transformers, wai, wai-extra
+     , hspec, http-client, http-types, servant, servant-aeson-specs
+     , servant-client, servant-server, text, transformers, wai
+     , wai-extra, warp
      }:
      mkDerivation {
        pname = "servant-matrix-param";
-       version = "0.3";
-       sha256 = "8b74bc16a7948862e509dc5692989de8e471be4b8933f4e2152a9d4b575c2997";
+       version = "0.3.1";
+       sha256 = "2559133dee1629ddfca41aca6d7ac0f3b0283ae3470228bd5bd71ce4c79f6641";
        libraryHaskellDepends = [ base servant ];
        testHaskellDepends = [
-         aeson base bytestring containers doctest hspec http-types servant
-         servant-aeson-specs servant-server text transformers wai wai-extra
+         aeson base bytestring containers doctest hspec http-client
+         http-types servant servant-aeson-specs servant-client
+         servant-server text transformers wai wai-extra warp
        ];
        description = "Matrix parameter combinator for servant";
        license = stdenv.lib.licenses.mit;
@@ -146803,7 +149637,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "servant-server_0_9_0_1" = callPackage
+  "servant-server_0_9_1_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat
      , base64-bytestring, bytestring, containers, directory, doctest
      , exceptions, filemanip, filepath, hspec, hspec-wai, http-api-data
@@ -146814,8 +149648,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-server";
-       version = "0.9.0.1";
-       sha256 = "c353df6cdfe2d97648ea3e912dfa61a62d567b9b7431a037bab2b08ccdfade70";
+       version = "0.9.1.1";
+       sha256 = "1e0683557ece1f7a8a7b11e5c7cd1fd042783777157d95a67e28a0518c91bdd1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -146911,8 +149745,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-subscriber";
-       version = "0.5.0.2";
-       sha256 = "5da646e0b2170b23febf11024aaa367553874b284cb33f57bde6063d65f0d671";
+       version = "0.5.0.3";
+       sha256 = "0530f47c565c12624524c028dcc4f12517bd05d31ef1fed1b6a4aa084507842a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -148665,6 +151499,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {gdk_x11 = null; gtk_x11 = null;};
 
+  "sigma-ij" = callPackage
+    ({ mkDerivation, array, base, combinat, containers
+     , optparse-applicative, parsec2, random, time
+     }:
+     mkDerivation {
+       pname = "sigma-ij";
+       version = "0.2.0.2";
+       sha256 = "6ca35a8cbb816509c0110cf53c5ce3d34167cafa25a80d7064694d01970a9a19";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base combinat containers optparse-applicative parsec2 random
+         time
+       ];
+       executableHaskellDepends = [
+         base combinat optparse-applicative time
+       ];
+       homepage = "http://code.haskell.org/~bkomuves/";
+       description = "Thom polynomials of second order Thom-Boardman singularities";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "sign" = callPackage
     ({ mkDerivation, base, containers, deepseq, hashable, HUnit
      , lattices, QuickCheck, tasty, tasty-hunit, tasty-quickcheck
@@ -149683,8 +152539,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "singleton-bool";
-       version = "0.1.1.0";
-       sha256 = "c196a542ff65f3357219f8c8b294b31e84b0f1a5341c426160bb2909f1523d95";
+       version = "0.1.2.0";
+       sha256 = "33bbd0460a5363260f56b29b130babfc16921ba87cb4576569ecc0a0664d449d";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/phadej/singleton-bool#readme";
        description = "Type level booleans";
@@ -152508,8 +155364,8 @@ self: {
      }:
      mkDerivation {
        pname = "solr";
-       version = "0.3.2";
-       sha256 = "945f9e6ba4f967d1b2ec2bf5b482b1df56df40ab1524dba4a0fce841e70c46c2";
+       version = "0.3.3";
+       sha256 = "5703365d767023c7dd9fe5584968655f0115a5ad6b65bf28762dfeb959ed325c";
        libraryHaskellDepends = [
          base base-prelude bytestring bytestring-tree-builder
          case-insensitive contravariant http-client http-response-decoder
@@ -152854,20 +155710,18 @@ self: {
 
   "sparkle" = callPackage
     ({ mkDerivation, base, binary, bytestring, distributed-closure
-     , filepath, inline-java, process, regex-tdfa, singletons, text
-     , vector, zip-archive
+     , filepath, jni, jvm, process, regex-tdfa, singletons, text, vector
+     , zip-archive
      }:
      mkDerivation {
        pname = "sparkle";
-       version = "0.2";
-       sha256 = "28c80bbc72dd4f0fdf6ae11f7e0dc4a1f6b47f2681ac71cd62158bb0ad4439e6";
-       revision = "1";
-       editedCabalFile = "6cee669a8e79fde86256c9d018f9d20490cbad97e80f051853a10d00f81bf642";
+       version = "0.3";
+       sha256 = "72b97e6fe8867bbaa797bb1416df14bbfd61e7bd1e1b0c9b9b2c97cc0e37b7d5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base binary bytestring distributed-closure inline-java singletons
-         text vector
+         base binary bytestring distributed-closure jni jvm singletons text
+         vector
        ];
        executableHaskellDepends = [
          base bytestring filepath process regex-tdfa text zip-archive
@@ -152928,8 +155782,8 @@ self: {
      }:
      mkDerivation {
        pname = "sparse-linear-algebra";
-       version = "0.2.0.4";
-       sha256 = "ef390020094294f52fbe37d40b3fc6cd21b38f021eb2ab5ef81af719c3ceecbe";
+       version = "0.2.0.9";
+       sha256 = "e71d62721edb02d38e578d6c286af76ad7a98638a8b4e398efd3ca7e280371de";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -153226,6 +156080,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "sphinx_0_6_0_2" = callPackage
+    ({ mkDerivation, base, binary, bytestring, data-binary-ieee754
+     , network, text, text-icu, xml
+     }:
+     mkDerivation {
+       pname = "sphinx";
+       version = "0.6.0.2";
+       sha256 = "76a977c6ce6e71c220bd5fed7acd0be500c2a1b5c8d081a29564a8e37ba7a6df";
+       libraryHaskellDepends = [
+         base binary bytestring data-binary-ieee754 network text text-icu
+         xml
+       ];
+       homepage = "https://github.com/gregwebs/haskell-sphinx-client";
+       description = "Haskell bindings to the Sphinx full-text searching daemon";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "sphinx-cli" = callPackage
     ({ mkDerivation, base, sphinx }:
      mkDerivation {
@@ -153816,8 +156688,8 @@ self: {
     ({ mkDerivation, base, mtl, parsec, sqlite-simple, text }:
      mkDerivation {
        pname = "sqlite-simple-errors";
-       version = "0.5.0.0";
-       sha256 = "33db4862ead8ec91016838d62ed6f232eb4643dcf271ac833f148b0ea40f5c63";
+       version = "0.6.0.0";
+       sha256 = "e697ba5ff6b4df227d782cb2d2327ce5df4282acdb17e8087ae76adbfabfd980";
        libraryHaskellDepends = [ base parsec sqlite-simple text ];
        testHaskellDepends = [ base mtl sqlite-simple text ];
        homepage = "https://github.com/caneroj1/sqlite-simple-errors";
@@ -155162,14 +158034,12 @@ self: {
      }) {};
 
   "stb-image-redux" = callPackage
-    ({ mkDerivation, base, hspec, vector }:
+    ({ mkDerivation, base, hspec, primitive, vector }:
      mkDerivation {
        pname = "stb-image-redux";
-       version = "0.1.0.4";
-       sha256 = "317ba2e3347d54050262568b3b0cf75891919eccd9a9594ba71c60265d195dbb";
-       revision = "1";
-       editedCabalFile = "59533529f7bdf491b9b35d24431ccf65e6c3dc4163ceb89860d23773dffcd84a";
-       libraryHaskellDepends = [ base vector ];
+       version = "0.2.0.0";
+       sha256 = "1ad898ff99f7c1d6532dea98c6acdb1f786bc7c6095f72b179e423aaac3b9515";
+       libraryHaskellDepends = [ base primitive vector ];
        testHaskellDepends = [ base hspec vector ];
        homepage = "https://github.com/sasinestro/stb-image-redux#readme";
        description = "Image loading and writing microlibrary";
@@ -155877,6 +158747,49 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "store_0_3" = callPackage
+    ({ mkDerivation, array, async, base, base-orphans
+     , base64-bytestring, bytestring, cereal, cereal-vector, conduit
+     , containers, criterion, cryptohash, deepseq, directory, filepath
+     , free, ghc-prim, hashable, hspec, hspec-smallcheck, integer-gmp
+     , lifted-base, monad-control, mono-traversable, network, primitive
+     , resourcet, safe, semigroups, smallcheck, store-core
+     , streaming-commons, syb, template-haskell, text, th-lift
+     , th-lift-instances, th-orphans, th-reify-many, th-utilities, time
+     , transformers, unordered-containers, vector
+     , vector-binary-instances, void, weigh
+     }:
+     mkDerivation {
+       pname = "store";
+       version = "0.3";
+       sha256 = "bdefbf35d52ef36d33b57eed5f24761e33feb689ef38fba3eebcfab723491b5b";
+       libraryHaskellDepends = [
+         array async base base-orphans base64-bytestring bytestring conduit
+         containers cryptohash deepseq directory filepath free ghc-prim
+         hashable hspec hspec-smallcheck integer-gmp lifted-base
+         monad-control mono-traversable network primitive resourcet safe
+         semigroups smallcheck store-core streaming-commons syb
+         template-haskell text th-lift th-lift-instances th-orphans
+         th-reify-many th-utilities time transformers unordered-containers
+         vector void
+       ];
+       testHaskellDepends = [
+         array async base base-orphans base64-bytestring bytestring cereal
+         cereal-vector conduit containers criterion cryptohash deepseq
+         directory filepath free ghc-prim hashable hspec hspec-smallcheck
+         integer-gmp lifted-base monad-control mono-traversable network
+         primitive resourcet safe semigroups smallcheck store-core
+         streaming-commons syb template-haskell text th-lift
+         th-lift-instances th-orphans th-reify-many th-utilities time
+         transformers unordered-containers vector vector-binary-instances
+         void weigh
+       ];
+       homepage = "https://github.com/fpco/store#readme";
+       description = "Fast binary serialization";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "store-core" = callPackage
     ({ mkDerivation, base, bytestring, fail, ghc-prim, primitive, text
      , transformers
@@ -155893,6 +158806,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "store-core_0_3" = callPackage
+    ({ mkDerivation, base, bytestring, fail, ghc-prim, primitive, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "store-core";
+       version = "0.3";
+       sha256 = "8793230b634a310a91db98727dfa6f34a0b7f5ded55985342066d33d98507087";
+       libraryHaskellDepends = [
+         base bytestring fail ghc-prim primitive text transformers
+       ];
+       homepage = "https://github.com/fpco/store#readme";
+       description = "Fast and lightweight binary serialization";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "str" = callPackage
     ({ mkDerivation, base, base16-bytestring, bytestring, Crypto
      , hashable, MissingH, text, utf8-string
@@ -155939,6 +158869,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "stratosphere_0_2_0" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
+     , hlint, lens, tasty, tasty-hspec, template-haskell, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "stratosphere";
+       version = "0.2.0";
+       sha256 = "7a5b78bbcf125e5fec7e377ddb6917111341bab23a7bf5567e1393a910f9085e";
+       libraryHaskellDepends = [
+         aeson aeson-pretty base bytestring lens template-haskell text
+         unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson aeson-pretty base bytestring directory hlint lens tasty
+         tasty-hspec template-haskell text unordered-containers
+       ];
+       homepage = "https://github.com/frontrowed/stratosphere#readme";
+       description = "EDSL for AWS CloudFormation";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "stratum-tool" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, bytestring-builder
      , cmdargs, connection, containers, curl, curl-aeson, network, stm
@@ -157476,6 +160429,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "svg-tree_0_6" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers
+     , JuicyPixels, lens, linear, mtl, scientific, text, transformers
+     , vector, xml
+     }:
+     mkDerivation {
+       pname = "svg-tree";
+       version = "0.6";
+       sha256 = "7b055b1f66fe8aeacb91bb01315275b3669ddb84b057bd28fdbed17d1e1c5732";
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers JuicyPixels lens linear mtl
+         scientific text transformers vector xml
+       ];
+       description = "SVG file loader and serializer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "svg2q" = callPackage
     ({ mkDerivation, base, haskell98, language-c, pretty, svgutils, syb
      , xml
@@ -160356,10 +163327,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "teeth";
-       version = "0.1.0.0";
-       sha256 = "94f544c6bb663b37f7999ce59d24b67120d795e76f1107025cac374c4e89b1c3";
-       revision = "1";
-       editedCabalFile = "84bb818fc4cb06bf91450e31e9a023926449a6157ce1e5de60649cda931db416";
+       version = "0.2.0.2";
+       sha256 = "0c59db4fc490591772fd5b1c216c341fd10393b5751e5c4d0128fa9d2f716a6e";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/expipiplus1/teeth";
        description = "Dental data types";
@@ -160410,6 +163379,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "telegram-bot" = callPackage
+    ({ mkDerivation, base, containers, http-client, http-client-tls
+     , pipes, telegram-api, text, transformers
+     }:
+     mkDerivation {
+       pname = "telegram-bot";
+       version = "0.5.1.0";
+       sha256 = "525fc12654179fa7c57ae062741bb236f5821dc1b5c0c8b9a5c62946d8817fd3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers http-client http-client-tls pipes telegram-api text
+         transformers
+       ];
+       executableHaskellDepends = [ base text ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/akru/telegram-bot#readme";
+       description = "Telegram Bot microframework for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "teleport" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, bytestring
      , configurator, optparse-applicative, system-filepath, text, turtle
@@ -160488,6 +163478,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "template-haskell-compat-v0208" = callPackage
+    ({ mkDerivation, base, base-prelude, template-haskell }:
+     mkDerivation {
+       pname = "template-haskell-compat-v0208";
+       version = "0.1.1";
+       sha256 = "e3d2ede7a0da70c6c477a56c61c92e5b43e684ac7fb05d421ea840643e73fdb5";
+       libraryHaskellDepends = [ base base-prelude template-haskell ];
+       homepage = "https://github.com/nikita-volkov/template-haskell-compat-v0208";
+       description = "A backwards compatibility layer for Template Haskell newer than 2.8";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "template-haskell-util" = callPackage
     ({ mkDerivation, base, GenericPretty, ghc-prim, template-haskell }:
      mkDerivation {
@@ -162057,6 +165059,37 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "text-show_3_4_1" = callPackage
+    ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors
+     , bytestring, bytestring-builder, containers, contravariant
+     , deriving-compat, generic-deriving, ghc-boot-th, ghc-prim, hspec
+     , integer-gmp, nats, QuickCheck, quickcheck-instances, semigroups
+     , tagged, template-haskell, text, th-lift, transformers
+     , transformers-compat, void
+     }:
+     mkDerivation {
+       pname = "text-show";
+       version = "3.4.1";
+       sha256 = "1a1ac1c88004b3c060d09d011f645e6fbcf59147b109ee4192cbe7724732558b";
+       libraryHaskellDepends = [
+         array base base-compat bifunctors bytestring bytestring-builder
+         containers contravariant generic-deriving ghc-boot-th ghc-prim
+         integer-gmp nats semigroups tagged template-haskell text th-lift
+         transformers transformers-compat void
+       ];
+       testHaskellDepends = [
+         array base base-compat base-orphans bifunctors bytestring
+         bytestring-builder containers contravariant deriving-compat
+         generic-deriving ghc-boot-th ghc-prim hspec integer-gmp nats
+         QuickCheck quickcheck-instances semigroups tagged template-haskell
+         text th-lift transformers transformers-compat void
+       ];
+       homepage = "https://github.com/RyanGlScott/text-show";
+       description = "Efficient conversion of values into Text";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "text-show-instances" = callPackage
     ({ mkDerivation, base, base-compat, bifunctors, binary, bytestring
      , containers, directory, generic-deriving, ghc-boot, ghc-prim
@@ -163271,8 +166304,8 @@ self: {
      }:
      mkDerivation {
        pname = "tianbar";
-       version = "1.1.0.1";
-       sha256 = "cf58ba500aa8d68bce6e35b233f13b8d8d1a2efecef24e4fece628cfd171df73";
+       version = "1.1.1.1";
+       sha256 = "0cc35cd49ab80f083091dc085e942e1b3b0c5bf37aeab54e402b9dbc6aff9927";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -164299,16 +167332,17 @@ self: {
      }:
      mkDerivation {
        pname = "titlecase";
-       version = "0.1.0.2";
-       sha256 = "4860625a5233a9cc923224e0d86f113200b6636a79bef209acf40f1dcb631ce1";
+       version = "0.1.0.3";
+       sha256 = "67bbc3f21d7e020afa4547aaacabf8927d53fd5e6dae41f3a0b92ab018172222";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base blaze-markup semigroups text ];
-       executableHaskellDepends = [ base blaze-markup text ];
+       executableHaskellDepends = [ base blaze-markup semigroups text ];
        testHaskellDepends = [
-         base semigroups tasty tasty-hunit tasty-quickcheck text
+         base blaze-markup semigroups tasty tasty-hunit tasty-quickcheck
+         text
        ];
-       homepage = "https://github.com/nkaretnikov/titlecase";
+       homepage = "https://github.com/peti/titlecase#readme";
        description = "Convert English words to title case";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -166800,26 +169834,6 @@ self: {
      }) {};
 
   "twitter-feed" = callPackage
-    ({ mkDerivation, aeson, authenticate-oauth, base, bytestring
-     , containers, http-conduit, HUnit, test-framework
-     , test-framework-hunit
-     }:
-     mkDerivation {
-       pname = "twitter-feed";
-       version = "0.2.0.10";
-       sha256 = "8dc2ea040a332086588b8e314bd3ba389446e1e7d8746d1fca188e01c9005de0";
-       libraryHaskellDepends = [
-         aeson authenticate-oauth base bytestring http-conduit
-       ];
-       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;
-     }) {};
-
-  "twitter-feed_0_2_0_11" = callPackage
     ({ mkDerivation, aeson, authenticate-oauth, base, bytestring
      , containers, http-conduit, HUnit, test-framework
      , test-framework-hunit
@@ -166837,7 +169851,6 @@ self: {
        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
@@ -167304,8 +170317,8 @@ self: {
     ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
        pname = "type-operators";
-       version = "0.1.0.3";
-       sha256 = "ea0b994df588b84679171878ebdc420d20dbfef975d263ff48622ab161057dc2";
+       version = "0.1.0.4";
+       sha256 = "dbbcedf368c23c46abac04f157cb4f2c812099a4f75d606b24f1ac1116d40b74";
        libraryHaskellDepends = [ base ghc-prim ];
        homepage = "https://github.com/Shou/type-operators#readme";
        description = "Various type-level operators";
@@ -167494,6 +170507,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "typed-process" = callPackage
+    ({ mkDerivation, async, base, base64-bytestring, bytestring
+     , conduit, conduit-extra, exceptions, hspec, http-conduit, process
+     , stm, temporary, transformers
+     }:
+     mkDerivation {
+       pname = "typed-process";
+       version = "0.1.0.0";
+       sha256 = "de866bc6ccb3ae3ccce20701add8bd913f7d7b4e252a9133eac35d035d0a10f8";
+       libraryHaskellDepends = [
+         async base bytestring conduit conduit-extra exceptions process stm
+         transformers
+       ];
+       testHaskellDepends = [
+         async base base64-bytestring bytestring conduit conduit-extra hspec
+         http-conduit temporary
+       ];
+       homepage = "https://github.com/fpco/typed-process#readme";
+       description = "Run external processes, with strong typing of streams";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "typed-spreadsheet" = callPackage
     ({ mkDerivation, async, base, diagrams-cairo, diagrams-gtk
      , diagrams-lib, foldl, gtk, microlens, stm, text, transformers
@@ -167794,13 +170829,13 @@ self: {
      }:
      mkDerivation {
        pname = "u2f";
-       version = "0.1.0.0";
-       sha256 = "b7d123b1eee52751bc1310e2acca2129241bf5588a2587dcfe37691e1ff17205";
+       version = "0.1.0.1";
+       sha256 = "b5843d158a5356d4a75a09a30952cd886e16b52227d2080fe5959c4a7aeb57be";
        libraryHaskellDepends = [
          aeson asn1-encoding asn1-types base base64-bytestring binary
-         bytestring cryptohash cryptonite either-unwrap text
+         bytestring cryptohash cryptonite text
        ];
-       testHaskellDepends = [ base bytestring hspec text ];
+       testHaskellDepends = [ base bytestring either-unwrap hspec text ];
        homepage = "https://github.com/EButlerIV/u2f";
        description = "Haskell Universal Two Factor helper toolbox library thing";
        license = stdenv.lib.licenses.bsd3;
@@ -167967,8 +171002,8 @@ self: {
      }:
      mkDerivation {
        pname = "udp-conduit";
-       version = "0.1.0.2";
-       sha256 = "eb2c50cdffe220c5913d434dac25b345d7c12516a0caae5c844529a8f3084903";
+       version = "0.1.0.4";
+       sha256 = "52d3d29e9d2243014aea9af04e7243b512c1679ec04e54c1dc74d55e94a0178e";
        libraryHaskellDepends = [
          base chunked-data conduit-combinators mono-traversable network
        ];
@@ -168335,6 +171370,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "unfoldable_0_9" = callPackage
+    ({ mkDerivation, base, containers, ghc-prim, QuickCheck, random
+     , transformers
+     }:
+     mkDerivation {
+       pname = "unfoldable";
+       version = "0.9";
+       sha256 = "decb997909f9cd8c6ad618a46290c6df922e525361ec5d06e9db3b3822a40f77";
+       libraryHaskellDepends = [
+         base containers 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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "unfoldable-restricted" = callPackage
     ({ mkDerivation, base, constraints, containers, hashable
      , transformers, unfoldable, unit-constraint, unordered-containers
@@ -168578,6 +171630,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "unicode-transforms_0_2_0" = callPackage
+    ({ mkDerivation, base, bitarray, bytestring, deepseq
+     , getopt-generics, QuickCheck, split, text
+     }:
+     mkDerivation {
+       pname = "unicode-transforms";
+       version = "0.2.0";
+       sha256 = "3b27ca1ae8f0a906fbbefe1de819a80a01933610a4657ef6383db2590fdecb0e";
+       libraryHaskellDepends = [ base bitarray bytestring text ];
+       testHaskellDepends = [
+         base deepseq getopt-generics QuickCheck split text
+       ];
+       homepage = "http://github.com/harendra-kumar/unicode-transforms";
+       description = "Unicode normalization";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "unicoder" = callPackage
     ({ mkDerivation, attoparsec, base, directory, text }:
      mkDerivation {
@@ -170858,6 +173928,43 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "vault-tool" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, http-client
+     , http-client-tls, http-types, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "vault-tool";
+       version = "0.0.0.1";
+       sha256 = "6be3b3e15e2e7dcd968f5ff3d6b72ba418ff60b70f1eb2669f10f8827537f8e8";
+       libraryHaskellDepends = [
+         aeson base bytestring http-client http-client-tls http-types text
+         unordered-containers
+       ];
+       homepage = "https://github.com/bitc/hs-vault-tool";
+       description = "Client library for HashiCorp's Vault tool (via HTTP API)";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "vault-tool-server" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, filepath
+     , http-client, process, tasty-hunit, temporary, text, vault-tool
+     }:
+     mkDerivation {
+       pname = "vault-tool-server";
+       version = "0.0.0.1";
+       sha256 = "cde6fc62398c4656f4a17e4f3db875acd927069b1b32a7a2c8316c819495f50d";
+       libraryHaskellDepends = [
+         aeson async base bytestring filepath http-client process temporary
+         text vault-tool
+       ];
+       testHaskellDepends = [
+         aeson base tasty-hunit temporary vault-tool
+       ];
+       homepage = "https://github.com/bitc/hs-vault-tool";
+       description = "Utility library for spawning a HashiCorp Vault process";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "vaultaire-common" = callPackage
     ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring
      , cereal, containers, hashable, hslogger, hspec, locators, mtl
@@ -171164,6 +174271,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "vector-builder" = callPackage
+    ({ mkDerivation, base, base-prelude, quickcheck-instances, rebase
+     , semigroups, tasty, tasty-hunit, tasty-quickcheck, vector
+     }:
+     mkDerivation {
+       pname = "vector-builder";
+       version = "0.3";
+       sha256 = "6041b4a9b05c8d39c67cb4bedcf1192a33babda444f2ec64b24598874db45ec0";
+       libraryHaskellDepends = [ base base-prelude semigroups vector ];
+       testHaskellDepends = [
+         quickcheck-instances rebase tasty tasty-hunit tasty-quickcheck
+       ];
+       homepage = "https://github.com/nikita-volkov/vector-builder";
+       description = "Vector builder";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "vector-bytes-instances" = callPackage
     ({ mkDerivation, base, bytes, tasty, tasty-quickcheck, vector }:
      mkDerivation {
@@ -172195,6 +175319,43 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "vty_5_11_3" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
+     , data-default, deepseq, directory, filepath, hashable, HUnit
+     , microlens, microlens-mtl, microlens-th, mtl, parallel, parsec
+     , QuickCheck, quickcheck-assertions, random, smallcheck, stm
+     , string-qq, terminfo, test-framework, test-framework-hunit
+     , test-framework-smallcheck, text, transformers, unix, utf8-string
+     , vector
+     }:
+     mkDerivation {
+       pname = "vty";
+       version = "5.11.3";
+       sha256 = "0ee3fc39e8e5219b551bfc26ee38e9342e38b028480dacc2e6ac87fab5380232";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base blaze-builder bytestring containers data-default deepseq
+         directory filepath hashable microlens microlens-mtl microlens-th
+         mtl parallel parsec stm terminfo text transformers unix utf8-string
+         vector
+       ];
+       executableHaskellDepends = [
+         base containers data-default microlens microlens-mtl mtl
+       ];
+       testHaskellDepends = [
+         base blaze-builder bytestring Cabal containers data-default deepseq
+         HUnit microlens microlens-mtl mtl QuickCheck quickcheck-assertions
+         random smallcheck stm string-qq terminfo test-framework
+         test-framework-hunit test-framework-smallcheck text unix
+         utf8-string vector
+       ];
+       homepage = "https://github.com/coreyoconnor/vty";
+       description = "A simple terminal UI library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "vty-examples" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, containers
      , data-default, deepseq, lens, mtl, parallel, parsec, QuickCheck
@@ -172579,8 +175740,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-extra";
-       version = "3.0.18";
-       sha256 = "42fde2a6066c2de40b931a5379f3436899c96f7b31037ed27524ec86714d0764";
+       version = "3.0.19";
+       sha256 = "8002890c4aa4fc564a142982bc37f29c35caa76231697eb51c519a698482e3bf";
        libraryHaskellDepends = [
          aeson ansi-terminal base base64-bytestring blaze-builder bytestring
          case-insensitive containers cookie data-default-class deepseq
@@ -174001,6 +177162,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wavefront-obj" = callPackage
+    ({ mkDerivation, attoparsec, base, containers, hspec, linear, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "wavefront-obj";
+       version = "0.1.0.1";
+       sha256 = "f73744ebc9dd035686f089c368434bf6940bd0c9928258aa00b7258677c0e258";
+       libraryHaskellDepends = [
+         attoparsec base containers linear text transformers
+       ];
+       testHaskellDepends = [ base hspec linear ];
+       homepage = "https://github.com/sasinestro/wavefront-obj#readme";
+       description = "Wavefront .obj file loader";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "wavesurfer" = callPackage
     ({ mkDerivation, base, binary, bytestring, bytestring-lexing
      , bytestring-show, delimited-text
@@ -175093,23 +178271,6 @@ self: {
      }) {};
 
   "wikicfp-scraper" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, filepath, hspec
-     , scalpel, text, time
-     }:
-     mkDerivation {
-       pname = "wikicfp-scraper";
-       version = "0.1.0.4";
-       sha256 = "57c916f27a4e4a7f2b6aad3d60d91aff9ea4a1981ad145bc4f1e2062e76e970f";
-       libraryHaskellDepends = [
-         attoparsec base bytestring scalpel text time
-       ];
-       testHaskellDepends = [ base bytestring filepath hspec time ];
-       homepage = "https://github.com/debug-ito/wikicfp-scraper";
-       description = "Scrape WikiCFP web site";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "wikicfp-scraper_0_1_0_5" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, filepath, hspec
      , scalpel, text, time
      }:
@@ -175124,7 +178285,6 @@ self: {
        homepage = "https://github.com/debug-ito/wikicfp-scraper";
        description = "Scrape WikiCFP web site";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wikipedia4epub" = callPackage
@@ -175319,8 +178479,8 @@ self: {
      }:
      mkDerivation {
        pname = "wiring";
-       version = "0.4.2";
-       sha256 = "f8b9cc8d1811d88ad1a19e67ae071f4bcdef17ae3ce1f63e9664f5255033e689";
+       version = "0.5.0";
+       sha256 = "c442bf4d5beff553c289e459ef31d823569207ffa7afc61ef6cda64793fa01a8";
        libraryHaskellDepends = [ base mtl template-haskell transformers ];
        testHaskellDepends = [
          base hspec mtl QuickCheck template-haskell transformers
@@ -175357,6 +178517,24 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "withdependencies_0_2_4" = callPackage
+    ({ mkDerivation, base, conduit, containers, hspec, HUnit, mtl
+     , profunctors
+     }:
+     mkDerivation {
+       pname = "withdependencies";
+       version = "0.2.4";
+       sha256 = "a13eddc8fce5061204abf7289bed49bceb5b86a7981ba6a1b3fe510727fe267f";
+       libraryHaskellDepends = [
+         base conduit containers mtl profunctors
+       ];
+       testHaskellDepends = [ base conduit hspec HUnit mtl ];
+       homepage = "https://github.com/bartavelle/withdependencies";
+       description = "Run computations that depend on one or more elements in a stream";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "witherable" = callPackage
     ({ mkDerivation, base, base-orphans, containers, hashable
      , transformers, unordered-containers, vector
@@ -175613,8 +178791,8 @@ self: {
      }:
      mkDerivation {
        pname = "wolf";
-       version = "0.2.8";
-       sha256 = "a76f54f9274e021787c59f2739a55a74f803576eaa624c506648839dd3b52a8c";
+       version = "0.2.12";
+       sha256 = "fabd09aa41a108a0d10fbb2611c3a7c0faf123103809428e235d2dbfa8080ade";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -175683,8 +178861,8 @@ self: {
      }:
      mkDerivation {
        pname = "word24";
-       version = "2.0.0";
-       sha256 = "b02d7fd126d93c514d56b5592b959706a7fda5124452eeacbc646d09f3f932ae";
+       version = "2.0.1";
+       sha256 = "c34ba17cc88df314151ef27dea192102ed73d5f0678f1359a5fe59799dc3a086";
        libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [
          base deepseq QuickCheck test-framework test-framework-quickcheck2
@@ -176596,8 +179774,8 @@ self: {
      }:
      mkDerivation {
        pname = "x86-64bit";
-       version = "0.4.1";
-       sha256 = "c980fccd28989467703dee57477d0b4c8916cc52a81e8aa8d3aa5c206726bbaf";
+       version = "0.4.4";
+       sha256 = "4deca451bb872b0ea29851e51c04d88af735dff454e9df38d3dc998c531bc9e2";
        libraryHaskellDepends = [
          base deepseq monads-tf QuickCheck tardis vector
        ];
@@ -177162,14 +180340,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "xlsx-tabular_0_1_0_2" = callPackage
+  "xlsx-tabular_0_1_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, data-default
      , lens, text, xlsx
      }:
      mkDerivation {
        pname = "xlsx-tabular";
-       version = "0.1.0.2";
-       sha256 = "0650c6e22c4b1f2be1d91a62cdf6160a17f2a18cfe7918cc30523a923218689d";
+       version = "0.1.1";
+       sha256 = "b266fd453913fede59a1d27122b675035829de7e7037eaa92de8a1e40f942f7d";
        libraryHaskellDepends = [
          aeson base bytestring containers data-default lens text xlsx
        ];
@@ -178579,37 +181757,6 @@ self: {
      }) {};
 
   "yaml" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat
-     , bytestring, conduit, containers, directory, enclosed-exceptions
-     , filepath, hspec, HUnit, libyaml, mockery, resourcet, scientific
-     , semigroups, temporary, text, transformers, unordered-containers
-     , vector
-     }:
-     mkDerivation {
-       pname = "yaml";
-       version = "0.8.18.7";
-       sha256 = "b8cebafe9294b34258114b8ea5576d26c2d0070645ab9bfc84000b367931a944";
-       configureFlags = [ "-fsystem-libyaml" ];
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring conduit containers directory
-         enclosed-exceptions filepath resourcet scientific semigroups text
-         transformers unordered-containers vector
-       ];
-       libraryPkgconfigDepends = [ libyaml ];
-       executableHaskellDepends = [ aeson base bytestring ];
-       testHaskellDepends = [
-         aeson aeson-qq base base-compat bytestring conduit directory hspec
-         HUnit mockery resourcet temporary text transformers
-         unordered-containers vector
-       ];
-       homepage = "http://github.com/snoyberg/yaml/";
-       description = "Support for parsing and rendering YAML documents";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) libyaml;};
-
-  "yaml_0_8_19_0" = callPackage
     ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat
      , bytestring, conduit, containers, directory, enclosed-exceptions
      , filepath, hspec, HUnit, libyaml, mockery, resourcet, scientific
@@ -178618,8 +181765,8 @@ self: {
      }:
      mkDerivation {
        pname = "yaml";
-       version = "0.8.19.0";
-       sha256 = "750ced274e3124face6808d5c7a999b12ac578cae102f15507aa47adc77375d1";
+       version = "0.8.20";
+       sha256 = "d5cda5b2849afb9f0d7572759c3e006798d7efaeeb0bf0d3825f12832a0a3b11";
        configureFlags = [ "-fsystem-libyaml" ];
        isLibrary = true;
        isExecutable = true;
@@ -178638,7 +181785,6 @@ self: {
        homepage = "http://github.com/snoyberg/yaml/";
        description = "Support for parsing and rendering YAML documents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libyaml;};
 
   "yaml-config" = callPackage
@@ -179041,8 +182187,8 @@ self: {
      }:
      mkDerivation {
        pname = "yes-precure5-command";
-       version = "5.5.2";
-       sha256 = "19ed62fa3277ce1356005bd8715f41526057dd152c9a2c3ab18158431ff0c52a";
+       version = "5.5.3";
+       sha256 = "27f2f2dcd81923a18450cda21a31585d0d3887afde504190667cb7dbf0a0af7e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -179902,6 +183048,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-form_1_4_8" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
+     , blaze-markup, byteable, bytestring, containers, data-default
+     , email-validate, hspec, network-uri, persistent, resourcet
+     , semigroups, shakespeare, template-haskell, text, time
+     , transformers, wai, xss-sanitize, yesod-core, yesod-persistent
+     }:
+     mkDerivation {
+       pname = "yesod-form";
+       version = "1.4.8";
+       sha256 = "c6f2f83dd361569f830c95671b70c7510b485840d20b9ade6c747de127088f0b";
+       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
+       ];
+       testHaskellDepends = [ base hspec text time ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Form handling support for Yesod Web Framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-form-json" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, text
      , unordered-containers, yesod-core, yesod-form
@@ -180927,7 +184098,7 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
-  "yi_0_13_2" = callPackage
+  "yi_0_13_3" = callPackage
     ({ mkDerivation, base, microlens-platform, mtl
      , optparse-applicative, yi-core, yi-frontend-pango, yi-frontend-vty
      , yi-keymap-emacs, yi-keymap-vim, yi-misc-modes, yi-mode-haskell
@@ -180935,8 +184106,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi";
-       version = "0.13.2";
-       sha256 = "ecdc9100717aa46929895e1c8b4e0e0dce2291c680e57c5d0274db8fc1ff8a33";
+       version = "0.13.3";
+       sha256 = "e6caf353d17a18378a6a31a90f8b4130eab7ea51d548218d620e9037b0a01036";
        configureFlags = [ "-fpango" "-fvty" ];
        isLibrary = false;
        isExecutable = true;
@@ -180983,8 +184154,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-core";
-       version = "0.13.2";
-       sha256 = "014a0a6e7a9c5a8435c7505ed13088ec00f608d6d0c561118d8d566bb5fdd991";
+       version = "0.13.3";
+       sha256 = "41f2ace2aa9cdbcc8392ac007c5c94a2785a659acd50d8fb5b3a87a9f296948c";
        libraryHaskellDepends = [
          array attoparsec base binary bytestring containers data-default
          directory dlist dynamic-state dyre exceptions filepath hashable
@@ -181026,8 +184197,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-frontend-pango";
-       version = "0.13.2";
-       sha256 = "3954fd213b431808f7dc2ae7d2b0db6764f2bd5e28109e3e38af835d540e61f4";
+       version = "0.13.3";
+       sha256 = "8da397739c5b448aa825f69bb2f0d085c68091540cc6e80fa09d384acc8a1cfd";
        libraryHaskellDepends = [
          base containers filepath glib gtk microlens-platform mtl
          oo-prototypes pango pointedlist text transformers-base yi-core
@@ -181045,8 +184216,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-frontend-vty";
-       version = "0.13.2";
-       sha256 = "8c3f235cd4ea8b92be2bb5872af97da408e4389bcd3935c25577c3e3275473f6";
+       version = "0.13.3";
+       sha256 = "3dd96a09085b7ad5375e9038af38fef7cb72c1c3dd9c7941fbe40d4ae43f5002";
        libraryHaskellDepends = [
          base containers data-default dlist microlens-platform pointedlist
          stm text vty yi-core yi-language
@@ -181074,15 +184245,15 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
-  "yi-fuzzy-open_0_13_2" = callPackage
+  "yi-fuzzy-open_0_13_3" = callPackage
     ({ mkDerivation, base, binary, containers, data-default, directory
      , filepath, mtl, text, transformers-base, vector, yi-core
      , yi-language, yi-rope
      }:
      mkDerivation {
        pname = "yi-fuzzy-open";
-       version = "0.13.2";
-       sha256 = "3186c6af375a33427c5a38e182d23f0077b27801b8f786a0d30128e79b2c9b9f";
+       version = "0.13.3";
+       sha256 = "51f827d2d9deec703a0450f90aed40d2084379fc3ab59d51d13b444f316e893c";
        libraryHaskellDepends = [
          base binary containers data-default directory filepath mtl text
          transformers-base vector yi-core yi-language yi-rope
@@ -181111,8 +184282,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-ireader";
-       version = "0.13.2";
-       sha256 = "7c5f0cdadc2758fe774b4424812f239cd74595d8aa030f3b686611c9507b7a35";
+       version = "0.13.3";
+       sha256 = "7f8f3985386f3a64ad4de36c93b81183a08f9c0d5d9fbe4acfc47ac2a19cb2c7";
        libraryHaskellDepends = [
          base binary bytestring containers data-default microlens-platform
          text yi-core yi-language yi-rope
@@ -181128,8 +184299,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-keymap-cua";
-       version = "0.13.2";
-       sha256 = "e3630512c92d720c75b43fb696777a7428dc75504a938995e063bf1c54b7d694";
+       version = "0.13.3";
+       sha256 = "ba7836bd5192212baa9b3ae5c7a839953be08be67aa5199068f472f9a24f5a54";
        libraryHaskellDepends = [
          base microlens-platform text yi-core yi-keymap-emacs yi-rope
        ];
@@ -181146,8 +184317,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-keymap-emacs";
-       version = "0.13.2";
-       sha256 = "abd09be4752f7b023e3ed1179d33c18eea5ad12ee3b54ae006984ecb68d5d120";
+       version = "0.13.3";
+       sha256 = "3b2ee411a67904f011c6f5f9ac7739d7c4571c4a0c8deaef82aaeb44176cd1b2";
        libraryHaskellDepends = [
          base containers filepath Hclip microlens-platform mtl oo-prototypes
          semigroups text transformers-base yi-core yi-language yi-misc-modes
@@ -181168,8 +184339,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-keymap-vim";
-       version = "0.13.2";
-       sha256 = "8df50b084dc4eabee5b51c51356e3ecbb9997f505c44b93494c63524dc87f8b8";
+       version = "0.13.3";
+       sha256 = "e81caeb7866e485a88ede2b88cfe7f6fbbc6ea9cd21424502d11150df64211b4";
        libraryHaskellDepends = [
          attoparsec base binary containers data-default directory filepath
          Hclip microlens-platform mtl oo-prototypes pointedlist safe
@@ -181214,7 +184385,7 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
-  "yi-language_0_13_2" = callPackage
+  "yi-language_0_13_3" = callPackage
     ({ mkDerivation, alex, array, base, binary, containers
      , data-default, hashable, microlens-platform, oo-prototypes
      , pointedlist, regex-base, regex-tdfa, tasty, tasty-hspec
@@ -181223,8 +184394,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-language";
-       version = "0.13.2";
-       sha256 = "0ff97092dda3132bcc047b7a2b94182f3cc3ed4440e0d208deb50999e3d49309";
+       version = "0.13.3";
+       sha256 = "06d3c328777bed0fb1c0ab8a7fabfed6603fa6cfc4d50f3195c85e9bae99cc5f";
        libraryHaskellDepends = [
          array base binary containers data-default hashable
          microlens-platform oo-prototypes pointedlist regex-base regex-tdfa
@@ -181250,8 +184421,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-misc-modes";
-       version = "0.13.2";
-       sha256 = "9580862c8c17778c19961ba357dee62157beaa5aff31ba6fa62408c0ec709201";
+       version = "0.13.3";
+       sha256 = "94993c405dccbc2aa4f5077096560c68219414a2d747f84a195b4fd556f7e63e";
        libraryHaskellDepends = [
          array base binary data-default filepath microlens-platform
          semigroups text yi-core yi-language yi-rope
@@ -181271,8 +184442,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-mode-haskell";
-       version = "0.13.2";
-       sha256 = "91e66f823e733043f83e0814036fdfca4f54bfcd822817b77f0bf0bc4f85fb0b";
+       version = "0.13.3";
+       sha256 = "438ff92a24aef5e3cb7a8aa0046014b8f40927f046a612f830a20fb2ef9a6fde";
        libraryHaskellDepends = [
          array base binary data-default microlens-platform text yi-core
          yi-language yi-rope
@@ -181295,8 +184466,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-mode-javascript";
-       version = "0.13.2";
-       sha256 = "eb3ca37f65db4d0016487ce3dc7846c49482edc63e2a43484bdc4b846b09047f";
+       version = "0.13.3";
+       sha256 = "1a24664cf2d65732b5575bd4ab3bc92d3897a3c6af4bc93296945429b5c974f3";
        libraryHaskellDepends = [
          array base binary data-default dlist filepath microlens-platform
          mtl text yi-core yi-language yi-rope
@@ -181366,8 +184537,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-snippet";
-       version = "0.13.2";
-       sha256 = "6d118cf4bc071ca909f4fc8f0012481dac52965af367faec513530bf2f95b2f0";
+       version = "0.13.3";
+       sha256 = "0373adb2e93de479995cc64299106a3fb2ba2dbfb5abb87d811ef13f47a39077";
        libraryHaskellDepends = [
          base binary containers data-default free lens mtl text vector
          yi-core yi-rope
@@ -182035,20 +185206,20 @@ self: {
      }) {};
 
   "zim-parser" = callPackage
-    ({ mkDerivation, array, base, binary, binary-conduit, bytestring
-     , conduit, conduit-extra, hspec, lzma-conduit, resourcet
+    ({ mkDerivation, array, base, base-compat, binary, binary-conduit
+     , bytestring, conduit, conduit-extra, hspec, lzma
      }:
      mkDerivation {
        pname = "zim-parser";
-       version = "0.2.0.0";
-       sha256 = "663e6604b20c67bfd3e0ba161c3f7c88f10230a28282990311133d8a9d962df6";
+       version = "0.2.1.0";
+       sha256 = "b27f6a395c54e0dac6926a5ea18b582aa21c5d91e31b53f8749f063947a15789";
        libraryHaskellDepends = [
-         array base binary binary-conduit bytestring conduit conduit-extra
-         lzma-conduit resourcet
+         array base base-compat binary binary-conduit bytestring conduit
+         conduit-extra lzma
        ];
        testHaskellDepends = [
-         array base binary binary-conduit bytestring conduit conduit-extra
-         hspec lzma-conduit resourcet
+         array base base-compat binary binary-conduit bytestring conduit
+         conduit-extra hspec lzma
        ];
        homepage = "https://github.com/robbinch/zim-parser#readme";
        description = "Read and parse ZIM files";
@@ -182230,6 +185401,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) zlib;};
 
+  "zlib_0_6_1_2" = callPackage
+    ({ mkDerivation, base, bytestring, QuickCheck, tasty, tasty-hunit
+     , tasty-quickcheck, zlib
+     }:
+     mkDerivation {
+       pname = "zlib";
+       version = "0.6.1.2";
+       sha256 = "e4eb4e636caf07a16a9730ce469a00b65d5748f259f43edd904dd457b198a2bb";
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ zlib ];
+       testHaskellDepends = [
+         base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
+       ];
+       description = "Compression and decompression in the gzip and zlib formats";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) zlib;};
+
   "zlib-bindings" = callPackage
     ({ mkDerivation, base, bytestring, hspec, QuickCheck, zlib }:
      mkDerivation {

From 2a19aea54a23f43570e0670fddf75c5061b490c7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Oct 2016 22:53:08 +0200
Subject: [PATCH 58/87] haskell-stack: fix evaluation

(cherry picked from commit 9c31962c075933b6dae6ef5374f01768fe7a892b)
---
 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 8274365a952..d23bfc70ebd 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -976,7 +976,7 @@ self: super: {
 
   # https://github.com/commercialhaskell/stack/issues/2263
   stack = super.stack.overrideScope (self: super: {
-    http-client = self.http-client_0_5_3_2;
+    http-client = self.http-client_0_5_3_3;
     http-client-tls = self.http-client-tls_0_3_3;
     http-conduit = self.http-conduit_2_2_3;
     optparse-applicative = dontCheck self.optparse-applicative_0_13_0_0;

From 4cfc1642564d5f552f97da27450e1c7742ba2332 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Oct 2016 23:21:40 +0200
Subject: [PATCH 59/87] haskell-titlecase: drop obsolete overrides

(cherry picked from commit 118efe87b99cf475e6bcf2a559f4e23f4ab3f94f)
---
 pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
index e0629457d9e..5c7348678b7 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -60,7 +60,4 @@ self: super: {
     sha256 = "026vv2k3ks73jngwifszv8l59clg88pcdr4mz0wr0gamivkfa1zy";
   });
 
-  # https://github.com/nkaretnikov/titlecase/issues/6
-  titlecase = doJailbreak super.titlecase;
-
 }

From 0cf03e02ae396a91a9eced858709d516b84f97e0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Oct 2016 09:03:58 +0200
Subject: [PATCH 60/87] git-annex: update to latest version

(cherry picked from commit b6df43a2df3c1b998a3c4ce5fb1e54a1691e3f41)
---
 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 d23bfc70ebd..35b47467216 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -43,7 +43,7 @@ self: super: {
     src = pkgs.fetchFromGitHub {
       owner = "joeyh";
       repo = "git-annex";
-      sha256 = "1j29ydbw86j3qd4qb4l348pcnjd24irgdra9ss2afi6w2pn60yjn";
+      sha256 = "1nd1q5c4jr9s6xczyv464zq4y10rk8c1av22nfb28abrskxagcjc";
       rev = drv.version;
     };
   })).overrideScope (self: super: {

From 64b1fe26a77bd90384752b0124d7f0d6aa393b56 Mon Sep 17 00:00:00 2001
From: Sean Bartell <yotann@yotann.org>
Date: Fri, 28 Oct 2016 10:54:33 -0500
Subject: [PATCH 61/87] nc6: remove

The download sources are gone and the program is obsolete now that
the popular versions of netcat support IPv6. See:
http://www.deepspace6.net/projects/netcat6.html
---
 pkgs/tools/networking/nc6/default.nix | 18 ------------------
 pkgs/top-level/all-packages.nix       |  2 --
 2 files changed, 20 deletions(-)
 delete mode 100644 pkgs/tools/networking/nc6/default.nix

diff --git a/pkgs/tools/networking/nc6/default.nix b/pkgs/tools/networking/nc6/default.nix
deleted file mode 100644
index 9c097929471..00000000000
--- a/pkgs/tools/networking/nc6/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation {
-  name = "nc6-1.0";
-
-  src = fetchurl {
-    urls = [
-      ftp://ftp.deepspace6.net/pub/ds6/sources/nc6/nc6-1.0.tar.bz2
-      http://fossies.org/linux/privat/nc6-1.0.tar.bz2
-    ];
-    sha256 = "01l28zv1yal58ilfnz6albdzqqxzsx3a58vmc14r9gv0bahffdgb";
-  };
-
-  meta = {
-    description = "A netcat implementation with IPv6 support";
-    homepage = http://www.deepspace6.net/projects/netcat6.html;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 62727cf83b1..e3b9b25c91d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2783,8 +2783,6 @@ in
 
   nco = callPackage ../development/libraries/nco { };
 
-  nc6 = callPackage ../tools/networking/nc6 { };
-
   ncftp = callPackage ../tools/networking/ncftp { };
 
   ncompress = callPackage ../tools/compression/ncompress { };

From 6977b94e9b5e7889c1190df065e5e58ab3c6e553 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 28 Oct 2016 18:15:40 +0200
Subject: [PATCH 62/87] Revert "xserverArgs fuckup"

This reverts commit c2922a9157a8d8db62cee763e254113c3766461e.

See https://github.com/NixOS/nixpkgs/issues/19930

While the above commit is designed to allow GDM to work, it appears to
break other use cases.  In particular, it breaks tests involving X
usage (e.g., i3wm[1] and firefox[2]), which makes it difficult to assess
the impact of other changes and so hampers development of unrelated
features.

https://hydra.nixos.org/build/42852015
https://hydra.nixos.org/build/42851666
---
 nixos/modules/services/x11/xserver.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index db60e47c3ea..f5ed5233818 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -547,19 +547,18 @@ in
         };
       };
 
-    services.xserver.displayManager.xserverArgs = mkDefault (
-      [ #"-terminate"
+    services.xserver.displayManager.xserverArgs =
+      [ "-terminate"
         "-config ${configFile}"
         "-xkbdir" "${cfg.xkbDir}"
         # Log at the default verbosity level to stderr rather than /var/log/X.*.log.
-        #"-verbose" "3" "-logfile" "/dev/null"
-      ] #++ optional (cfg.display != null) ":${toString cfg.display}"
-        #++ optional (cfg.tty     != null) "vt${toString cfg.tty}"
+        "-verbose" "3" "-logfile" "/dev/null"
+      ] ++ optional (cfg.display != null) ":${toString cfg.display}"
+        ++ optional (cfg.tty     != null) "vt${toString cfg.tty}"
         ++ optional (cfg.dpi     != null) "-dpi ${toString cfg.dpi}"
-        #++ optional (!cfg.enableTCP) "-nolisten tcp");
+        ++ optional (!cfg.enableTCP) "-nolisten tcp"
         ++ optional (cfg.autoRepeatDelay != null) "-ardelay ${toString cfg.autoRepeatDelay}"
-        ++ optional (cfg.autoRepeatInterval != null) "-arinterval ${toString cfg.autoRepeatInterval}"
-);
+        ++ optional (cfg.autoRepeatInterval != null) "-arinterval ${toString cfg.autoRepeatInterval}";
 
     services.xserver.modules =
       concatLists (catAttrs "modules" cfg.drivers) ++

From a79fdce0b801e913262ce02107dee0b03643964d Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 28 Oct 2016 14:08:20 -0400
Subject: [PATCH 63/87] sbt: 0.13.12 -> 0.13.13

---
 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 48ec100f593..e6006e94881 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.12";
+  version = "0.13.13";
 
   src = fetchurl {
     url = "https://dl.bintray.com/sbt/native-packages/sbt/${version}/${name}.tgz";
-    sha256 = "1pq3c9nhxbdpx5csmpvjv93nz2z04n2gzzwyd7sllaplqgwk00i8";
+    sha256 = "0ygrz92qkzasj6fps1bjg7wlgl69867jjjc37yjadib0l8hkvl20";
   };
 
   patchPhase = ''

From 5d83aaee96ec48467f4156eabe233436de5c6f5e Mon Sep 17 00:00:00 2001
From: Igor Sharonov <igsha@users.noreply.github.com>
Date: Thu, 27 Oct 2016 22:37:13 +0300
Subject: [PATCH 64/87] pythonPackages.patch: init at 1.16

---
 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 6fcd44dac0b..52a9464b1f8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17589,6 +17589,29 @@ in modules // {
     };
   };
 
+  patch = buildPythonPackage rec {
+    name = "${pname}-${version}";
+    version = "1.16";
+    pname = "patch";
+
+    src = pkgs.fetchzip {
+      url = "mirror://pypi/p/${pname}/${name}.zip";
+      sha256 = "1nj55hvyvzax4lxq7vkyfbw91pianzr3hp7ka7j12pgjxccac50g";
+      stripRoot = false;
+    };
+
+    # No tests included in archive
+    doCheck = false;
+
+    meta = {
+      description = "A library to parse and apply unified diffs";
+      homepage = https://github.com/techtonik/python-patch/;
+      license = licenses.mit;
+      platforms = platforms.all;
+      maintainers = [ maintainers.igsha ];
+    };
+  };
+
   pathos = buildPythonPackage rec {
     name = "pathos-${version}";
     version = "0.2.0";

From 872087a8a617164bf0b46b1797fc2d46bf368a6c Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Fri, 28 Oct 2016 11:29:29 -0700
Subject: [PATCH 65/87] disable DBIxClass tests again

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index caab784c857..7e294c7f5da 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3603,6 +3603,8 @@ let self = _self // overrides; _self = with self; {
   };
 
   DBIxClass = buildPerlPackage rec {
+    # tests broken again
+    doCheck = false;
     name = "DBIx-Class-0.082840";
     src = fetchurl {
       url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/${name}.tar.gz";

From 62d9edb9b9c79c0ef4967d894edebb0dd74565ff Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Fri, 17 Jun 2016 11:26:41 +0300
Subject: [PATCH 66/87] gnupg: Rename parameter x11Support -> guiSupport

Because it is really about GUI in general, not X11 (e.g. OS X).
---
 pkgs/tools/security/gnupg/20.nix | 6 +++---
 pkgs/tools/security/gnupg/21.nix | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix
index 932bf508c2f..2783031c7b5 100644
--- a/pkgs/tools/security/gnupg/20.nix
+++ b/pkgs/tools/security/gnupg/20.nix
@@ -3,13 +3,13 @@
 
 # Each of the dependencies below are optional.
 # Gnupg can be built without them at the cost of reduced functionality.
-, pinentry ? null, x11Support ? true
+, pinentry ? null, guiSupport ? true
 , openldap ? null, bzip2 ? null, libusb ? null, curl ? null
 }:
 
 with stdenv.lib;
 
-assert x11Support -> pinentry != null;
+assert guiSupport -> pinentry != null;
 
 stdenv.mkDerivation rec {
   name = "gnupg-2.0.30";
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     patch gl/stdint_.h < ${./clang.patch}
   '';
 
-  configureFlags = optional x11Support "--with-pinentry-pgm=${pinentry}/bin/pinentry";
+  configureFlags = optional guiSupport "--with-pinentry-pgm=${pinentry}/bin/pinentry";
 
   postConfigure = "substituteAllInPlace tools/gpgkey2ssh.c";
 
diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix
index a6328a2140e..a548088f1e5 100644
--- a/pkgs/tools/security/gnupg/21.nix
+++ b/pkgs/tools/security/gnupg/21.nix
@@ -3,14 +3,14 @@
 
 # Each of the dependencies below are optional.
 # Gnupg can be built without them at the cost of reduced functionality.
-, pinentry ? null, x11Support ? true
+, pinentry ? null, guiSupport ? true
 , adns ? null, gnutls ? null, libusb ? null, openldap ? null
 , readline ? null, zlib ? null, bzip2 ? null
 }:
 
 with stdenv.lib;
 
-assert x11Support -> pinentry != null;
+assert guiSupport -> pinentry != null;
 
 stdenv.mkDerivation rec {
   name = "gnupg-${version}";
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c
   ''; #" fix Emacs syntax highlighting :-(
 
-  configureFlags = optional x11Support "--with-pinentry-pgm=${pinentry}/bin/pinentry";
+  configureFlags = optional guiSupport "--with-pinentry-pgm=${pinentry}/bin/pinentry";
 
   meta = with stdenv.lib; {
     homepage = http://gnupg.org;

From 3d4b6257d666149991a4c718601bd834cf100b79 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 28 Oct 2016 22:50:44 +0200
Subject: [PATCH 67/87] nixos/stage1: Fix local keyword outside function

Thanks to @NeQuissimus in a5c1985fef381b1fb5d75d3b4028ed5b5d4454b3 for
updating busybox, which since version 1.25 doesn't allow local variables
outside of functions anymore (which is the desired behaviour).

See the following upstream commit of busybox which is the change that
let's this problem surface:

https://git.busybox.net/busybox/commit/?id=ef2386b80abfb22ccb697ddbdd4047aacc395c50

So this has been an error I've made on my end in
67223ee205364afb203361b134f16b890c4d726c, because I originally had a
function for killing the processes but desired to inline it because it's
only used in one place.

This fixes the boot-stage1 NixOS test.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/modules/system/boot/stage-1-init.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index abab5f20baa..7803f1bd1aa 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -498,8 +498,7 @@ eval "exec $logOutFd>&- $logErrFd>&-"
 #
 # Storage daemons are distinguished by an @ in front of their command line:
 # https://www.freedesktop.org/wiki/Software/systemd/RootStorageDaemons/
-local pidsToKill="$(pgrep -v -f '^@')"
-for pid in $pidsToKill; do
+for pid in $(pgrep -v -f '^@'); do
     # Make sure we don't kill kernel processes, see #15226 and:
     # http://stackoverflow.com/questions/12213445/identifying-kernel-threads
     readlink "/proc/$pid/exe" &> /dev/null || continue

From 268568a74acfbd03c1b30eab31e4fc439c6ce8fb Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 28 Oct 2016 23:04:07 +0200
Subject: [PATCH 68/87] eclipses: use HTTPS download URLs

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

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index d24a91d60d6..4663e8c64f8 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -20,12 +20,12 @@ rec {
     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/neon/R/eclipse-cpp-neon-R-linux-gtk-x86_64.tar.gz;
+          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/neon/R/eclipse-cpp-neon-R-linux-gtk-x86_64.tar.gz;
           sha256 = "09fqsgvbjfdqvn7z03crkii34z4bsb34y272q68ib8741bxk0i6m";
         }
       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/neon/R/eclipse-cpp-neon-R-linux-gtk.tar.gz;
+          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/neon/R/eclipse-cpp-neon-R-linux-gtk.tar.gz;
           sha256 = "0a12qmqq22v7sbmwn1hjv1zcrkmp64bf0ajmdjljhs9ac79mxn5h";
         }
       else throw "Unsupported system: ${stdenv.system}";
@@ -37,12 +37,12 @@ rec {
     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/indigo/R/eclipse-cpp-indigo-incubation-linux-gtk-x86_64.tar.gz;
+          url = https://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://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;
+          url = https://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";
         };
   };
@@ -56,12 +56,12 @@ rec {
     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/neon/1a/eclipse-modeling-neon-1a-linux-gtk-x86_64.tar.gz;
+          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/neon/1a/eclipse-modeling-neon-1a-linux-gtk-x86_64.tar.gz;
           sha1 = "3695fd049c4cca2d235f424557e19877795a8183";
         }
       else
         fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/neon/1a/eclipse-modeling-neon-1a-linux-gtk.tar.gz;
+          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/neon/1a/eclipse-modeling-neon-1a-linux-gtk.tar.gz;
           sha1 = "fa0694a0b44e8e9c2301417f84dba45cf9ac6e61";
         };
   };
@@ -72,12 +72,12 @@ rec {
     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/helios/SR2/eclipse-modeling-helios-SR2-incubation-linux-gtk-x86_64.tar.gz;
+          url = https://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://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;
+          url = https://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";
         };
   };
@@ -92,11 +92,11 @@ rec {
     description = "Eclipse platform";
     sources = {
       "x86_64-linux" = fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.1-201609071200/eclipse-SDK-4.6.1-linux-gtk-x86_64.tar.gz;
+          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.1-201609071200/eclipse-SDK-4.6.1-linux-gtk-x86_64.tar.gz;
           sha256 = "1mr7sj4whz23iwz5j6mbqd80a39177qv0r7b6cip7dji4n2agl8j";
         };
       "i686-linux" = fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.1-201609071200/eclipse-SDK-4.6.1-linux-gtk.tar.gz;
+          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.1-201609071200/eclipse-SDK-4.6.1-linux-gtk.tar.gz;
           sha256 = "0kgj0zpgzwx90q13c4mr8swf63azd56532ycxgq2rbs0d1qbl87j";
         };
     };
@@ -110,12 +110,12 @@ rec {
     src =
       if stdenv.system == "x86_64-linux" then
         fetchurl { # tested
-          url = http://downloads.typesafe.com/scalaide-pack/4.4.1-vfinal-luna-211-20160504/scala-SDK-4.4.1-vfinal-2.11-linux.gtk.x86_64.tar.gz;
+          url = https://downloads.typesafe.com/scalaide-pack/4.4.1-vfinal-luna-211-20160504/scala-SDK-4.4.1-vfinal-2.11-linux.gtk.x86_64.tar.gz;
           sha256  = "4c2d1ac68384e12a11a851cf0fc7757aea087eba69329b21d539382a65340d27";
         }
       else
         fetchurl { # untested
-          url = http://downloads.typesafe.com/scalaide-pack/4.4.1-vfinal-luna-211-20160504/scala-SDK-4.4.1-vfinal-2.11-linux.gtk.x86.tar.gz;
+          url = https://downloads.typesafe.com/scalaide-pack/4.4.1-vfinal-luna-211-20160504/scala-SDK-4.4.1-vfinal-2.11-linux.gtk.x86.tar.gz;
           sha256 = "35383cb09567187e14a30c15de9fd9aa0eef99e4bbb342396ce3acd11fb5cbac";
         };
   };
@@ -127,11 +127,11 @@ rec {
     description = "Eclipse Neon Classic";
     sources = {
       "x86_64-linux" = fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.1-201609071200/eclipse-SDK-4.6.1-linux-gtk-x86_64.tar.gz;
+          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.1-201609071200/eclipse-SDK-4.6.1-linux-gtk-x86_64.tar.gz;
           sha256 = "1mr7sj4whz23iwz5j6mbqd80a39177qv0r7b6cip7dji4n2agl8j";
         };
       "i686-linux" = fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.1-201609071200/eclipse-SDK-4.6.1-linux-gtk.tar.gz;
+          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.1-201609071200/eclipse-SDK-4.6.1-linux-gtk.tar.gz;
           sha256 = "0kgj0zpgzwx90q13c4mr8swf63azd56532ycxgq2rbs0d1qbl87j";
         };
     };
@@ -142,11 +142,11 @@ rec {
     description = "Eclipse Classic";
     sources = {
       "x86_64-linux" = fetchurl {
-          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;
+          url = https://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://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;
+          url = https://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";
         };
     };

From 236a32069a50537620fc41e8867f106f21ca6239 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 28 Oct 2016 23:07:50 +0200
Subject: [PATCH 69/87] perl-DBIx-Class: remove myself as maintainer

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 7e294c7f5da..b5824b2e05a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3617,7 +3617,6 @@ let self = _self // overrides; _self = with self; {
       homepage = http://www.dbix-class.org/;
       description = "Extensible and flexible object <-> relational mapper";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 

From 213dc2144357761ccb0dda36b137e5aaea29283d Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Fri, 17 Jun 2016 12:27:59 +0300
Subject: [PATCH 70/87] gnupg: Variable path to pinentry

This is needed for pinentry-mac which has the pinentry binary
at an OS X-ish path.
---
 pkgs/tools/security/gnupg/20.nix             | 3 ++-
 pkgs/tools/security/gnupg/21.nix             | 3 ++-
 pkgs/tools/security/pinentry-mac/default.nix | 4 ++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix
index 2783031c7b5..fd79419d82a 100644
--- a/pkgs/tools/security/gnupg/20.nix
+++ b/pkgs/tools/security/gnupg/20.nix
@@ -35,7 +35,8 @@ stdenv.mkDerivation rec {
     patch gl/stdint_.h < ${./clang.patch}
   '';
 
-  configureFlags = optional guiSupport "--with-pinentry-pgm=${pinentry}/bin/pinentry";
+  pinentryBinaryPath = pinentry.binaryPath or "bin/pinentry";
+  configureFlags = optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentryBinaryPath}";
 
   postConfigure = "substituteAllInPlace tools/gpgkey2ssh.c";
 
diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix
index a548088f1e5..b7a71332e77 100644
--- a/pkgs/tools/security/gnupg/21.nix
+++ b/pkgs/tools/security/gnupg/21.nix
@@ -32,7 +32,8 @@ stdenv.mkDerivation rec {
     sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c
   ''; #" fix Emacs syntax highlighting :-(
 
-  configureFlags = optional guiSupport "--with-pinentry-pgm=${pinentry}/bin/pinentry";
+  pinentryBinaryPath = pinentry.binaryPath or "bin/pinentry";
+  configureFlags = optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentryBinaryPath}";
 
   meta = with stdenv.lib; {
     homepage = http://gnupg.org;
diff --git a/pkgs/tools/security/pinentry-mac/default.nix b/pkgs/tools/security/pinentry-mac/default.nix
index faf8c613ea8..7116d1777d6 100644
--- a/pkgs/tools/security/pinentry-mac/default.nix
+++ b/pkgs/tools/security/pinentry-mac/default.nix
@@ -17,6 +17,10 @@ stdenv.mkDerivation rec {
     mv build/Release/pinentry-mac.app $out/Applications
   '';
 
+  passthru = {
+    binaryPath = "Applications/pinentry-mac.app/Contents/MacOS/pinentry-mac";
+  };
+
   meta = {
     description = "Pinentry for GPG on Mac";
     license = stdenv.lib.licenses.gpl2Plus;

From 22f2f6e04550ef2bd96800902bb6133f9249617d Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Fri, 17 Jun 2016 12:36:44 +0300
Subject: [PATCH 71/87] gnupg: Use pintenty-mac on Darwin by default

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e3b9b25c91d..abd483d4777 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1845,8 +1845,12 @@ in
   gnupg1orig = callPackage ../tools/security/gnupg/1.nix { };
   gnupg1compat = callPackage ../tools/security/gnupg/1compat.nix { };
   gnupg1 = gnupg1compat;    # use config.packageOverrides if you prefer original gnupg1
-  gnupg20 = callPackage ../tools/security/gnupg/20.nix { };
-  gnupg21 = callPackage ../tools/security/gnupg/21.nix { };
+  gnupg20 = callPackage ../tools/security/gnupg/20.nix {
+    pinentry = if stdenv.isDarwin then pinentry_mac else pinentry;
+  };
+  gnupg21 = callPackage ../tools/security/gnupg/21.nix {
+    pinentry = if stdenv.isDarwin then pinentry_mac else pinentry;
+  };
   gnupg = gnupg21;
 
   gnuplot = callPackage ../tools/graphics/gnuplot { qt = qt4; };

From 3a979c31d363637a83bc891d3116970b14c13c9b Mon Sep 17 00:00:00 2001
From: Anthony Cowley <acowley@gmail.com>
Date: Fri, 28 Oct 2016 19:11:58 -0400
Subject: [PATCH 72/87] tinyxml: fix install name on darwin

Things linked with tinyxml would previously reference the bare "libtinyxml.dylib"
name.
---
 pkgs/development/libraries/tinyxml/2.6.2.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/tinyxml/2.6.2.nix b/pkgs/development/libraries/tinyxml/2.6.2.nix
index 7fc403f0739..f885fc3f954 100644
--- a/pkgs/development/libraries/tinyxml/2.6.2.nix
+++ b/pkgs/development/libraries/tinyxml/2.6.2.nix
@@ -63,6 +63,8 @@ in stdenv.mkDerivation {
     cp -v tinyxml.pc $out/lib/pkgconfig/
 
     cp -v docs/* $out/share/doc/tinyxml/
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    install_name_tool -id $out/lib/libtinyxml.dylib $out/lib/libtinyxml.dylib
   '';
 
   meta = {

From d198e474a82e57c4ad2cb21e52a2f1ef65af2304 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 23 Oct 2016 23:26:21 +0200
Subject: [PATCH 73/87] dnscrypt-proxy service: remove use of mkEnableOption

---
 nixos/modules/services/networking/dnscrypt-proxy.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index 2714e8d7599..5a24db8ccba 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -35,7 +35,11 @@ in
 
   options = {
     services.dnscrypt-proxy = {
-      enable = mkEnableOption "DNSCrypt client proxy";
+      enable = mkOption {
+        default = false;
+        type = types.bool;
+        description = "Whether to enable the DNSCrypt client proxy";
+      };
 
       localAddress = mkOption {
         default = "127.0.0.1";

From 420cf50838e2b2808d6d9970d7cc281e8ff2c02f Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 24 Oct 2016 02:31:10 +0200
Subject: [PATCH 74/87] dnscrypt-proxy module: minor config example tweaks

- Indentation
- unbound automatically handles local forward addresses
---
 .../modules/services/networking/dnscrypt-proxy.xml  | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/networking/dnscrypt-proxy.xml b/nixos/modules/services/networking/dnscrypt-proxy.xml
index e212a8d3e2c..982961833ad 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.xml
+++ b/nixos/modules/services/networking/dnscrypt-proxy.xml
@@ -49,8 +49,8 @@
   <para>
     <programlisting>
       {
-      services.dnsmasq.enable = true;
-      services.dnsmasq.servers = [ "127.0.0.1#43" ];
+        services.dnsmasq.enable = true;
+        services.dnsmasq.servers = [ "127.0.0.1#43" ];
       }
     </programlisting>
   </para>
@@ -60,12 +60,9 @@
   <para>
     <programlisting>
       {
-      networking.nameservers = [ "127.0.0.1" ];
-      services.unbound.enable = true;
-      services.unbound.forwardAddresses = [ "127.0.0.1@43" ];
-      services.unbound.extraConfig = ''
-        do-not-query-localhost: no
-      '';
+        networking.nameservers = [ "127.0.0.1" ];
+        services.unbound.enable = true;
+        services.unbound.forwardAddresses = [ "127.0.0.1@43" ];
       }
     </programlisting>
   </para>

From a79695e3e20036cc4c3b4cc1729b1e8693c0baed Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 29 Oct 2016 02:56:38 +0200
Subject: [PATCH 75/87] dnscrypt-wrapper: 0.2.1 -> 0.2.2

Upstream changed distribution terms to what they call "0-clause BSD" aka
ISC.
---
 pkgs/tools/networking/dnscrypt-wrapper/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/dnscrypt-wrapper/default.nix b/pkgs/tools/networking/dnscrypt-wrapper/default.nix
index 491bf315757..9e7167989e4 100644
--- a/pkgs/tools/networking/dnscrypt-wrapper/default.nix
+++ b/pkgs/tools/networking/dnscrypt-wrapper/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "dnscrypt-wrapper-${version}";
-  version = "0.2.1";
+  version = "0.2.2";
 
   src = fetchFromGitHub {
     owner = "Cofyc";
     repo = "dnscrypt-wrapper";
     rev = "v${version}";
-    sha256 = "0gysylchvmxvqd4ims2cf2610vmxl80wlk62jhsv13p94yvrl53b";
+    sha256 = "0ip205safbpkmk1z7qf3hshqlc2q2zwhsm3i705m0y7rxc4200ms";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "A tool for adding dnscrypt support to any name resolver";
     homepage = https://dnscrypt.org/;
-    license = licenses.gpl2;
+    license = licenses.isc;
     maintainers = with maintainers; [ tstrobel joachifm ];
     platforms = platforms.linux;
   };

From 15d81fe30a2b59ab962958330a22d8b7b2292e58 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 29 Oct 2016 03:03:22 +0200
Subject: [PATCH 76/87] electrum: 2.7.9 -> 2.7.11

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

diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index 18f55698b08..bc562b7d577 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -2,11 +2,11 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "electrum-${version}";
-  version = "2.7.9";
+  version = "2.7.11";
 
   src = fetchurl {
     url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
-    sha256 = "0a3bdfcyrq5g3ihck80fqxxyzpj5k9sfax2nsmmwafmzmfqw819h";
+    sha256 = "0qy2ynyw57jgi7fw3xzsyy608yk4bhsda7qfw0j26zqinv52mrsb";
   };
 
   propagatedBuildInputs = with pythonPackages; [

From b1d399801596bf5f510aaf79fd44ca1c6c434ada Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sat, 29 Oct 2016 01:37:18 -0200
Subject: [PATCH 77/87] mplus-outline-fonts: 061 -> 062 (#19948)

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

diff --git a/pkgs/data/fonts/mplus-outline-fonts/default.nix b/pkgs/data/fonts/mplus-outline-fonts/default.nix
index e3d09adba57..839d61206c2 100644
--- a/pkgs/data/fonts/mplus-outline-fonts/default.nix
+++ b/pkgs/data/fonts/mplus-outline-fonts/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mplus-${version}";
-  version = "061";
+  version = "062";
 
   src = fetchurl {
     url = "mirror://sourceforgejp/mplus-fonts/62344/mplus-TESTFLIGHT-${version}.tar.xz";
-    sha256 = "1yrv65l2y8f9jmpalqb5iiay7z1x3754mnqpgp2bax72g8k8728g";
+    sha256 = "1f44vmnma5njhfiz351gwblxmdh9njv486864zrxqaa1h5pvdhha";
   };
 
   phases = [ "unpackPhase" "installPhase" ];

From fa4167c0a13cbe0d97b9c88d91b86845a8c4e740 Mon Sep 17 00:00:00 2001
From: Hans-Christian Esperer <hc@hcesperer.org>
Date: Sat, 29 Oct 2016 05:38:51 +0200
Subject: [PATCH 78/87] openmpt123: Add libsndfile and flac as dependencies
 (#19904)

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

diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix
index d5e0ed1c476..a13009407eb 100644
--- a/pkgs/applications/audio/openmpt123/default.nix
+++ b/pkgs/applications/audio/openmpt123/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, SDL2, pkgconfig }:
+{ stdenv, fetchurl, SDL2, pkgconfig, flac, libsndfile }:
 
 let
   version = "0.2.7025-beta20.1";
@@ -8,7 +8,7 @@ in stdenv.mkDerivation rec {
     url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}.tar.gz";
     sha256 = "0qp2nnz6pnl1d7yv9hcjyim7q6yax5881k1jxm8jfgjqagmz5k6p";
   };
-  buildInputs = [ SDL2 pkgconfig ];
+  buildInputs = [ SDL2 pkgconfig flac libsndfile ];
   makeFlags = [ "NO_LTDL=1 TEST=0 EXAMPLES=0" ]
   ++ stdenv.lib.optional (stdenv.isDarwin) "SHARED_SONAME=0";
   installFlags = "PREFIX=\${out}";

From 03457629cf63d0304b765c8c9de333343cd4a921 Mon Sep 17 00:00:00 2001
From: Alexander Ried <ried@mytum.de>
Date: Sat, 29 Oct 2016 07:25:07 +0200
Subject: [PATCH 79/87] tnef: remove duplicate file

---
 pkgs/applications/misc/tnef/tnef/default.nix | 30 --------------------
 1 file changed, 30 deletions(-)
 delete mode 100644 pkgs/applications/misc/tnef/tnef/default.nix

diff --git a/pkgs/applications/misc/tnef/tnef/default.nix b/pkgs/applications/misc/tnef/tnef/default.nix
deleted file mode 100644
index 3256ed1a570..00000000000
--- a/pkgs/applications/misc/tnef/tnef/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ fetchurl, lib }:
-
-stdenv.mkDerivation rec {
-  version = "1.4.12";
-  name = "tnef-${version}";
-
-  src = fetchFromGitHub {
-    owner = "verdammelt";
-    repo = "tnef";
-    rev = "${version}";
-    sha256 = "0ssi2wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i";
-  };
-
-  doCheck = true;
-
-  meta = with lib; {
-    description = "Unpacks MIME attachments of type application/ms-tnef";
-    longDescription = ''
-      TNEF is a program for unpacking MIME attachments of type "application/ms-tnef". This is a Microsoft only attachment.
-
-      Due to the proliferation of Microsoft Outlook and Exchange mail servers, more and more mail is encapsulated into this format.
-
-      The TNEF program allows one to unpack the attachments which were encapsulated into the TNEF attachment. Thus alleviating the need to use Microsoft Outlook to view the attachment.
-    '';
-    homepage = https://github.com/verdammelt/tnef;
-    license = licenses.gpl2;
-    maintainers = [ maintainers.DamienCassou ];
-    platforms = platforms.all;
-  };
-}

From 40cab6182ced7170e43df63781f495ed52f7f467 Mon Sep 17 00:00:00 2001
From: Andrew Cann <shum@canndrew.org>
Date: Sat, 29 Oct 2016 13:20:17 +0800
Subject: [PATCH 80/87] OpenNAT: init at 2.1.0

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

diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index 3508f1a1547..c0a7adb1d7f 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -181,6 +181,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     outputFiles = [ "bin/*" ];
   };
 
+  OpenNAT = fetchNuGet {
+    baseName = "Open.NAT";
+    version = "2.1.0";
+    sha256 = "1jyd30fwycdwx5ck96zhp2xf20yz0sp7g3pjbqhmay4kd322mfwk";
+    outputFiles = [ "lib/*" ];
+  };
+
   MonoNat = fetchNuGet {
     baseName = "Mono.Nat";
     version = "1.2.24";

From cc523714a6590973d8cfc3bc3f5b8d2705057762 Mon Sep 17 00:00:00 2001
From: Alexander Ried <ried@mytum.de>
Date: Sat, 29 Oct 2016 07:28:47 +0200
Subject: [PATCH 81/87] fetchfile: remove unused file

---
 pkgs/build-support/fetchfile/builder.sh  | 11 -----------
 pkgs/build-support/fetchfile/default.nix | 11 -----------
 2 files changed, 22 deletions(-)
 delete mode 100644 pkgs/build-support/fetchfile/builder.sh
 delete mode 100644 pkgs/build-support/fetchfile/default.nix

diff --git a/pkgs/build-support/fetchfile/builder.sh b/pkgs/build-support/fetchfile/builder.sh
deleted file mode 100644
index b849491fc5a..00000000000
--- a/pkgs/build-support/fetchfile/builder.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-source $stdenv/setup
-
-echo "copying $pathname into $out..."
-
-cp "$pathname" "$out" || exit 1
-
-actual=$(md5sum -b $out | cut -c1-32)
-if test "$actual" != "$md5"; then
-    echo "hash is $actual, expected $md5"
-    exit 1
-fi
diff --git a/pkgs/build-support/fetchfile/default.nix b/pkgs/build-support/fetchfile/default.nix
deleted file mode 100644
index 685c1e69520..00000000000
--- a/pkgs/build-support/fetchfile/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{stdenv}: {pathname, md5 ? "", sha256 ? ""}: stdenv.mkDerivation {
-  name = baseNameOf (toString pathname);
-  builder = ./builder.sh;
-  pathname = pathname;
-} // if (sha256 == "") then {
-  md5 = (stdenv.lib.fetchMD5warn "fetchfile" pathname md5);
-  id = md5;
-} else {
-  sha256 = sha256;
-  id = sha256;
-}

From de8e30c57780800d0d89ccdff6cb15db20443f6c Mon Sep 17 00:00:00 2001
From: Andrew Cann <shum@canndrew.org>
Date: Sat, 29 Oct 2016 13:33:34 +0800
Subject: [PATCH 82/87] openra: 20160508 -> 20161019

---
 pkgs/games/openra/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/games/openra/default.nix b/pkgs/games/openra/default.nix
index 747bd26afcc..ee8e865a6f1 100644
--- a/pkgs/games/openra/default.nix
+++ b/pkgs/games/openra/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, mono, makeWrapper, lua
 , SDL2, freetype, openal, systemd, pkgconfig,
-  dotnetPackages, gnome3
+  dotnetPackages, gnome3, curl, unzip
 }:
 
 let
-  version = "20160508";
+  version = "20161019";
 in stdenv.mkDerivation rec {
   name = "openra-${version}";
 
@@ -19,15 +19,15 @@ in stdenv.mkDerivation rec {
   src = fetchurl {
     name = "${name}.tar.gz";
     url = "https://github.com/OpenRA/OpenRA/archive/release-${version}.tar.gz";
-    sha256 = "1vr5bvdkh0n5569ga2h7ggj43vnzr37hfqkfnsis1sg4vgwrnzr7";
+    sha256 = "1psmq3kb2whkavh5pm0xc4m5b4bihvrl8pfrk851iqg1cs22bg0w";
   };
 
   dontStrip = true;
 
   buildInputs = with dotnetPackages;
-     [ NUnit3 NewtonsoftJson MonoNat FuzzyLogicLibrary SmartIrc4net SharpZipLib MaxMindGeoIP2 MaxMindDb SharpFont StyleCopMSBuild StyleCopPlusMSBuild RestSharp NUnitConsole ]
-     ++ [ lua gnome3.zenity ];
-  nativeBuildInputs = [ mono makeWrapper lua pkgconfig ];
+     [ NUnit3 NewtonsoftJson MonoNat FuzzyLogicLibrary SmartIrc4net SharpZipLib MaxMindGeoIP2 MaxMindDb SharpFont StyleCopMSBuild StyleCopPlusMSBuild RestSharp NUnitConsole OpenNAT ]
+     ++ [ curl unzip lua gnome3.zenity ];
+  nativeBuildInputs = [ curl unzip mono makeWrapper lua pkgconfig ];
 
   patchPhase = ''
     mkdir Support
@@ -42,6 +42,7 @@ in stdenv.mkDerivation rec {
   '';
 
   preBuild = let dotnetPackagesDlls = with dotnetPackages; [
+    "${OpenNAT}/lib/dotnet/Open.NAT/net45/Open.Nat.dll"
     "${MonoNat}/lib/dotnet/Mono.Nat/net40/Mono.Nat.dll"
     "${FuzzyLogicLibrary}/lib/dotnet/FuzzyLogicLibrary/Release/FuzzyLogicLibrary.dll"
     "${SmartIrc4net}/lib/dotnet/SmartIrc4net/net40/SmarIrc4net*"

From 2ad39a5670ffa4ea2bf4b75d8678cce1a3eb8b97 Mon Sep 17 00:00:00 2001
From: ft <ft@zeus>
Date: Sat, 29 Oct 2016 01:17:03 -0700
Subject: [PATCH 83/87] updated version and dependencies

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 37243a3e7ef..f502f75de09 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22523,16 +22523,19 @@ in {
 
   scikitimage = buildPythonPackage rec {
     name = "scikit-image-${version}";
-    version = "0.11.3";
+    version = "0.12.3";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/s/scikit-image/${name}.tar.gz";
-      sha256 = "768e568f3299966c294b7eb8cd114fc648f7bfaef422ee9cc750dd8d9d09e44b";
+      sha256 = "1iypjww5hk46i9vzg2zlfc9w4vdw029cfyakkkl02isj1qpiknl2";
     };
 
-    buildInputs = with self; [ cython nose numpy six ];
+    buildInputs = with self; [ cython dask nose numpy scipy six ];
 
-    propagatedBuildInputs = with self; [ pillow matplotlib networkx scipy ];
+    propagatedBuildInputs = with self; [ pillow matplotlib networkx scipy six numpy ];
+
+    # the test fails because the loader cannot create test objects!
+    doCheck = false;
 
     meta = {
       description = "Image processing routines for SciPy";

From faa6f9b6b3dc251c58ee0b6f8247b6d1a0678b81 Mon Sep 17 00:00:00 2001
From: Timofei Kushnir <timophey@ecotelecom.ru>
Date: Fri, 28 Oct 2016 17:57:26 +0300
Subject: [PATCH 84/87] grsecurity: fix 'isYes' and 'isNo'

---
 nixos/modules/security/grsecurity.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix
index 7ba25f866f2..53c2ace784e 100644
--- a/nixos/modules/security/grsecurity.nix
+++ b/nixos/modules/security/grsecurity.nix
@@ -67,9 +67,9 @@ in
     system.requiredKernelConfig = with config.lib.kernelConfig;
       [ (isEnabled "GRKERNSEC")
         (isEnabled "PAX")
-        (isYES "GRKERNSEC_SYSCTL")
-        (isYES "GRKERNSEC_SYSCTL_DISTRO")
-        (isNO "GRKERNSEC_NO_RBAC")
+        (isYes "GRKERNSEC_SYSCTL")
+        (isYes "GRKERNSEC_SYSCTL_DISTRO")
+        (isNo "GRKERNSEC_NO_RBAC")
       ];
 
     nixpkgs.config.grsecurity = true;

From dd04af4fccd1c0fba1ca271dd7933edfebc773b9 Mon Sep 17 00:00:00 2001
From: Guillaume Koenig <guillaume.koenig@scmfrance.fr>
Date: Tue, 25 Oct 2016 18:25:08 +0200
Subject: [PATCH 85/87] reno: init at 1.8.0

---
 lib/maintainers.nix                     |  1 +
 pkgs/development/tools/reno/default.nix | 27 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 3 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/tools/reno/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 735fc427c3c..5cb2e269123 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -179,6 +179,7 @@
   grahamc = "Graham Christensen <graham@grahamc.com>";
   gridaphobe = "Eric Seidel <eric@seidel.io>";
   guibert = "David Guibert <david.guibert@gmail.com>";
+  guillaumekoenig = "Guillaume Koenig <guillaume.edward.koenig@gmail.com>";
   hakuch = "Jesse Haber-Kucharsky <hakuch@gmail.com>";
   havvy = "Ryan Scheel <ryan.havvy@gmail.com>";
   hbunke = "Hendrik Bunke <bunke.hendrik@gmail.com>";
diff --git a/pkgs/development/tools/reno/default.nix b/pkgs/development/tools/reno/default.nix
new file mode 100644
index 00000000000..dbc2401970b
--- /dev/null
+++ b/pkgs/development/tools/reno/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, pythonPackages }:
+
+pythonPackages.buildPythonApplication rec {
+  name = "reno-${version}";
+  version = "1.8.0";
+
+  src = fetchurl {
+    url = "mirror://pypi/r/reno/${name}.tar.gz";
+    sha256 = "1pqg0xzcilmyrrnpa87m11xwlvfc94a98s28z9cgddkhw27lg3ps";
+  };
+
+  # Don't know how to make tests pass
+  doCheck = false;
+
+  # Nothing to strip (python files)
+  dontStrip = true;
+
+  propagatedBuildInputs = with pythonPackages; [ pbr six pyyaml ];
+  buildInputs = with pythonPackages; [ Babel ];
+
+  meta = with stdenv.lib; {
+    description = "Release Notes Manager";
+    homepage    = http://docs.openstack.org/developer/reno/;
+    license     = licenses.asl20;
+    maintainers = with maintainers; [ guillaumekoenig ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index abd483d4777..63568bd91cc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6288,6 +6288,8 @@ in
 
   redo = callPackage ../development/tools/build-managers/redo { };
 
+  reno = callPackage ../development/tools/reno { };
+
   re2c = callPackage ../development/tools/parsing/re2c { };
 
   remake = callPackage ../development/tools/build-managers/remake { };

From c2169369f029f14e7ca5538b9a06d2e274c6354f Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sat, 29 Oct 2016 08:58:30 -0400
Subject: [PATCH 86/87] khal: 0.8.2 -> 0.8.4

---
 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 305c5863626..0e93418255e 100644
--- a/pkgs/applications/misc/khal/default.nix
+++ b/pkgs/applications/misc/khal/default.nix
@@ -4,12 +4,12 @@ with python3Packages;
 
 buildPythonApplication rec {
   # Reenable tests for 0.9.0, they are broken at the moment: #15981
-  version = "0.8.2";
+  version = "0.8.4";
   name = "khal-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/k/khal/khal-${version}.tar.gz";
-    sha256 = "0ihclh3jsxhvq7azgdxbdzwbl7my30cdcg3g5ss5bpm4ivskrzzj";
+    sha256 = "03vy4dp9n43w51mwqjjy08dr5nj7wxqnb085visz3j43vzm42p1f";
   };
 
   LC_ALL = "en_US.UTF-8";

From 3feb9103541c1e5567d561916655e6d451c978c1 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sat, 29 Oct 2016 09:01:07 -0400
Subject: [PATCH 87/87] vdirsyncer: 0.13.1 -> 0.14.0

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

diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix
index 998679e15eb..633371606a8 100644
--- a/pkgs/tools/misc/vdirsyncer/default.nix
+++ b/pkgs/tools/misc/vdirsyncer/default.nix
@@ -6,12 +6,12 @@ let
   pythonPackages = python3Packages;
 in
 pythonPackages.buildPythonApplication rec {
-  version = "0.13.1";
+  version = "0.14.0";
   name = "vdirsyncer-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/v/vdirsyncer/${name}.tar.gz";
-    sha256 = "1c4kipcc7dx1rn5j1a1x7wckz09mm9ihwakf3ramwn1y78q5zanb";
+    sha256 = "1mbh2gykx9sqsnyfa962ifxksx4afl2lb9rcsbd6rsh3gj2il898";
   };
 
   propagatedBuildInputs = with pythonPackages; [