about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--lib/maintainers.nix1
-rw-r--r--nixos/doc/manual/release-notes/rl-1803.xml4
-rw-r--r--nixos/modules/services/networking/kresd.nix23
-rw-r--r--pkgs/applications/audio/faust/faust2.nix6
-rw-r--r--pkgs/applications/editors/texstudio/default.nix8
-rw-r--r--pkgs/applications/misc/diffpdf/default.nix16
-rw-r--r--pkgs/applications/misc/diffpdf/fix_path_poppler_qt5.patch (renamed from pkgs/applications/misc/diffpdf/fix_path_poppler_qt4.patch)14
-rw-r--r--pkgs/applications/misc/yokadi/default.nix30
-rw-r--r--pkgs/applications/networking/instant-messengers/ring-daemon/default.nix4
-rw-r--r--pkgs/applications/networking/instant-messengers/riot/riot-web.nix4
-rw-r--r--pkgs/applications/networking/mailreaders/notmuch-addrlookup/0001-notmuch-0.25-compatibility-fix.patch44
-rw-r--r--pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix16
-rw-r--r--pkgs/applications/networking/offrss/default.nix12
-rw-r--r--pkgs/applications/science/math/sage/default.nix31
-rw-r--r--pkgs/applications/version-management/smartgithg/default.nix6
-rw-r--r--pkgs/build-support/rust/build-rust-crate.nix1
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix2
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix6
-rw-r--r--pkgs/development/haskell-modules/configuration-hackage2nix.yaml174
-rw-r--r--pkgs/development/haskell-modules/hackage-packages.nix2911
-rw-r--r--pkgs/development/interpreters/python/build-python-package.nix4
-rw-r--r--pkgs/development/interpreters/python/mk-python-derivation.nix4
-rw-r--r--pkgs/development/libraries/grpc/default.nix41
-rw-r--r--pkgs/development/libraries/libyaml-cpp/default.nix12
-rw-r--r--pkgs/development/libraries/nix-plugins/default.nix10
-rw-r--r--pkgs/development/libraries/qpdf/default.nix4
-rw-r--r--pkgs/development/tools/buildah/default.nix49
-rw-r--r--pkgs/development/tools/gomodifytags/default.nix22
-rw-r--r--pkgs/development/tools/haskell/multi-ghc-travis/default.nix4
-rw-r--r--pkgs/games/openxcom/default.nix22
-rw-r--r--pkgs/os-specific/linux/kernel/linux-4.14.nix4
-rw-r--r--pkgs/os-specific/linux/kernel/linux-4.9.nix4
-rw-r--r--pkgs/tools/inputmethods/interception-tools/default.nix6
-rw-r--r--pkgs/tools/misc/cloc/default.nix14
-rw-r--r--pkgs/tools/package-management/nix/default.nix6
-rw-r--r--pkgs/top-level/all-packages.nix46
-rw-r--r--pkgs/top-level/perl-packages.nix15
37 files changed, 1449 insertions, 2131 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 1b7e2891e823..afbe5a95508f 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -493,6 +493,7 @@
   nicknovitski = "Nick Novitski <nixpkgs@nicknovitski.com>";
   nico202 = "Nicolò Balzarotti <anothersms@gmail.com>";
   NikolaMandic = "Ratko Mladic <nikola@mandic.email>";
+  nipav = "Niko Pavlinek <niko.pavlinek@gmail.com>";
   nixy = "Andrew R. M. <nixy@nixy.moe>";
   nmattia = "Nicolas Mattia <nicolas@nmattia.com>";
   nocoolnametom = "Tom Doggett <nocoolnametom@gmail.com>";
diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml
index fc62092b6f11..275f74654bed 100644
--- a/nixos/doc/manual/release-notes/rl-1803.xml
+++ b/nixos/doc/manual/release-notes/rl-1803.xml
@@ -38,6 +38,10 @@ has the following highlights: </para>
       </itemizedlist>
     </para>
   </listitem>
+
+  <listitem>
+    <para>PHP now defaults to PHP 7.2</para>
+  </listitem>
 </itemizedlist>
 
 </section>
diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix
index d0c19c4ecb71..aac02b811d71 100644
--- a/nixos/modules/services/networking/kresd.nix
+++ b/nixos/modules/services/networking/kresd.nix
@@ -46,6 +46,15 @@ in
         What addresses the server should listen on. (UDP+TCP 53)
       '';
     };
+    listenTLS = mkOption {
+      type = with types; listOf str;
+      default = [];
+      example = [ "198.51.100.1:853" "[2001:db8::1]:853" "853" ];
+      description = ''
+        Addresses on which kresd should provide DNS over TLS (see RFC 7858).
+        For detailed syntax see ListenStream in man systemd.socket.
+      '';
+    };
     # TODO: perhaps options for more common stuff like cache size or forwarding
   };
 
@@ -75,6 +84,18 @@ in
       socketConfig.FreeBind = true;
     };
 
+    systemd.sockets.kresd-tls = mkIf (cfg.listenTLS != []) rec {
+      wantedBy = [ "sockets.target" ];
+      before = wantedBy;
+      partOf = [ "kresd.socket" ];
+      listenStreams = cfg.listenTLS;
+      socketConfig = {
+        FileDescriptorName = "tls";
+        FreeBind = true;
+        Service = "kresd.service";
+      };
+    };
+
     systemd.sockets.kresd-control = rec {
       wantedBy = [ "sockets.target" ];
       before = wantedBy;
@@ -97,6 +118,8 @@ in
         Type = "notify";
         WorkingDirectory = cfg.cacheDir;
         Restart = "on-failure";
+        Sockets = [ "kresd.socket" "kresd-control.socket" ]
+          ++ optional (cfg.listenTLS != []) "kresd-tls.socket";
       };
 
       # Trust anchor goes from dns-root-data by default.
diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix
index 460c9da7ac31..877bd26a5c1b 100644
--- a/pkgs/applications/audio/faust/faust2.nix
+++ b/pkgs/applications/audio/faust/faust2.nix
@@ -16,13 +16,13 @@ with stdenv.lib.strings;
 
 let
 
-  version = "2.5.10";
+  version = "2.5.21";
 
   src = fetchFromGitHub {
     owner = "grame-cncm";
     repo = "faust";
-    rev = "v${builtins.replaceStrings ["."] ["-"] version}";
-    sha256 = "0sjhy7axa2dj1977iz6zmqvz9qzalcfnrx2fqx3xmk9hly847d6z";
+    rev = "${version}";
+    sha256 = "1kfrcfhpzkpjxsrvgwmc2valgwfb4b7gfwwnlnjq6f6dp56yflpz";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix
index fd973d4fbdee..03505ec11a5f 100644
--- a/pkgs/applications/editors/texstudio/default.nix
+++ b/pkgs/applications/editors/texstudio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt4, qmake4Hook, poppler_qt4, zlib, pkgconfig}:
+{ stdenv, fetchurl, qt5, poppler_qt5, zlib, pkgconfig}:
 
 stdenv.mkDerivation rec {
   pname = "texstudio";
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "18rxd7ra5k2f7s4c296b3v3pqhxjmfix9xpy9i1g4jm87ygqrbnd";
   };
 
-  nativeBuildInputs = [ qmake4Hook pkgconfig ];
-  buildInputs = [ qt4 poppler_qt4 zlib ];
+  nativeBuildInputs = [ qt5.qmake pkgconfig ];
+  buildInputs = [ qt5.qtbase qt5.qtscript qt5.qtsvg poppler_qt5 zlib ];
 
   qmakeFlags = [ "NO_APPDATA=True" ];
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 	'';
     homepage = http://texstudio.sourceforge.net;
     license = licenses.gpl2Plus;
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" ];
     maintainers = with maintainers; [ cfouche ];
   };
 }
diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/applications/misc/diffpdf/default.nix
index fd3d0b35729e..144e1fa566ca 100644
--- a/pkgs/applications/misc/diffpdf/default.nix
+++ b/pkgs/applications/misc/diffpdf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt4, poppler_qt4, qmake4Hook }:
+{ stdenv, fetchurl, fetchpatch, qmake, qttools, qtbase, poppler_qt5 }:
 
 stdenv.mkDerivation rec {
   version = "2.1.3";
@@ -9,13 +9,19 @@ stdenv.mkDerivation rec {
     sha256 = "0cr468fi0d512jjj23r5flfzx957vibc9c25gwwhi0d773h2w566";
   };
 
-  patches = [ ./fix_path_poppler_qt4.patch ];
+  patches = [
+    (fetchpatch {
+      url = https://raw.githubusercontent.com/gentoo/gentoo/9b971631588ff46e7c2d501bc35cd0d9ce2d98e2/app-text/diffpdf/files/diffpdf-2.1.3-qt5.patch;
+      sha256 = "0sax8gcqcmzf74hmdr3rarqs4nsxmml9qmh6pqyjmgl3lypxhafg";
+    })
+    ./fix_path_poppler_qt5.patch
+  ];
 
-  buildInputs = [ qt4 poppler_qt4 ];
-  nativeBuildInputs = [ qmake4Hook ];
+  nativeBuildInputs = [ qmake qttools ];
+  buildInputs = [ qtbase poppler_qt5 ];
 
   preConfigure = ''
-    substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT4@@ ${poppler_qt4.dev}
+    substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT5@@ ${poppler_qt5.dev}
     lrelease diffpdf.pro
   '';
 
diff --git a/pkgs/applications/misc/diffpdf/fix_path_poppler_qt4.patch b/pkgs/applications/misc/diffpdf/fix_path_poppler_qt5.patch
index e72cad8b7a25..9535ea2c6b0d 100644
--- a/pkgs/applications/misc/diffpdf/fix_path_poppler_qt4.patch
+++ b/pkgs/applications/misc/diffpdf/fix_path_poppler_qt5.patch
@@ -2,15 +2,15 @@ diff -uNr diffpdf-2.1.3/diffpdf.pro diffpdf-2.1.3-new/diffpdf.pro
 --- diffpdf-2.1.3/diffpdf.pro	2013-10-15 09:01:22.000000000 +0200
 +++ diffpdf-2.1.3-new/diffpdf.pro	2015-07-07 23:13:36.445572148 +0200
 @@ -47,9 +47,9 @@
- 	INCLUDEPATH += /c/poppler_lib/include/poppler/qt4
+ 	INCLUDEPATH += /c/poppler_lib/include/poppler/qt5
  	LIBS += -Wl,-rpath -Wl,/c/poppler_lib/bin -Wl,-L/c/poppler_lib/bin
      } else {
--	exists(/usr/include/poppler/qt4) {
+-	exists(/usr/include/poppler/qt5) {
 -	    INCLUDEPATH += /usr/include/poppler/cpp
--	    INCLUDEPATH += /usr/include/poppler/qt4
-+	exists(@@NIX_POPPLER_QT4@@/include/poppler/qt4) {
-+	    INCLUDEPATH += @@NIX_POPPLER_QT4@@/include/poppler/cpp
-+	    INCLUDEPATH += @@NIX_POPPLER_QT4@@/include/poppler/qt4
+-	    INCLUDEPATH += /usr/include/poppler/qt5
++	exists(@@NIX_POPPLER_QT5@@/include/poppler/qt5) {
++	    INCLUDEPATH += @@NIX_POPPLER_QT5@@/include/poppler/cpp
++	    INCLUDEPATH += @@NIX_POPPLER_QT5@@/include/poppler/qt5
  	} else {
  	    INCLUDEPATH += /usr/local/include/poppler/cpp
- 	    INCLUDEPATH += /usr/local/include/poppler/qt4
+ 	    INCLUDEPATH += /usr/local/include/poppler/qt5
diff --git a/pkgs/applications/misc/yokadi/default.nix b/pkgs/applications/misc/yokadi/default.nix
new file mode 100644
index 000000000000..dec861009eb4
--- /dev/null
+++ b/pkgs/applications/misc/yokadi/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, buildPythonApplication, dateutil,
+  sqlalchemy, setproctitle, icalendar, pycrypto }:
+
+buildPythonApplication rec {
+  pname = "yokadi";
+  version = "1.1.1";
+
+  src = fetchurl {
+    url = "https://yokadi.github.io/download/${pname}-${version}.tar.bz2";
+    sha256 = "af201da66fd3a8435b2ccd932082ab9ff13f5f2e3d6cd3624f1ab81c577aaf17";
+  };
+
+  propagatedBuildInputs = [
+    dateutil
+    sqlalchemy
+    setproctitle
+    icalendar
+    pycrypto
+  ];
+
+  # Yokadi doesn't have any tests
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "A command line oriented, sqlite powered, todo-list";
+    homepage = https://yokadi.github.io/index.html;
+    license = licenses.gpl3Plus;
+    maintainers = [ maintainers.nipav ];
+  };
+}
diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
index 0632e787c700..38bc58d8b103 100644
--- a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
@@ -77,7 +77,7 @@ let
       "${patchdir}/pjproject/add_dtls_transport.patch"
     ];
     CFLAGS = "-g -DPJ_ICE_MAX_CAND=256 -DPJ_ICE_MAX_CHECKS=150 -DPJ_ICE_COMP_BITS=2 -DPJ_ICE_MAX_STUN=3 -DPJSIP_MAX_PKT_LEN=8000";
-  }); 
+  });
 in
 stdenv.mkDerivation rec {
   name = "ring-daemon-${version}";
@@ -145,5 +145,7 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ taeer olynch ];
     platforms = platforms.linux;
+    # pjsip' fails to compile with the supplied patch set, see: https://hydra.nixos.org/build/68667921/nixlog/4
+    broken = true;
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index 92960e381233..ea8874548155 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name= "riot-web-${version}";
-  version = "0.13.3";
+  version = "0.13.5";
 
   src = fetchurl {
     url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
-    sha256 = "0acim3kad6lv5ni4blg75phb3njyk9s5h6x7fsn151h1pvsc5mmw";
+    sha256 = "1ap62ksi3dg7qijxxysjpnlmngzgh2jdldvb8s1jx14avanccch6";
   };
 
   installPhase = ''
diff --git a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/0001-notmuch-0.25-compatibility-fix.patch b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/0001-notmuch-0.25-compatibility-fix.patch
deleted file mode 100644
index be094c9a397f..000000000000
--- a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/0001-notmuch-0.25-compatibility-fix.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From a736c0dfd22cd4ab0da86c30a664c91843df1b98 Mon Sep 17 00:00:00 2001
-From: Adam Ruzicka <a.ruzicka@outlook.com>
-Date: Sat, 29 Jul 2017 12:16:29 +0200
-Subject: [PATCH] notmuch-0.25 compatibility fix
-
----
- notmuch-addrlookup.c | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/notmuch-addrlookup.c b/notmuch-addrlookup.c
-index c5cf5b4..a95ded0 100644
---- a/notmuch-addrlookup.c
-+++ b/notmuch-addrlookup.c
-@@ -171,6 +171,13 @@ create_queries (notmuch_database_t *db,
-       count += tmp;
-   if (notmuch_query_count_messages_st (queries[1], &tmp) == NOTMUCH_STATUS_SUCCESS)
-       count += tmp;
-+#elif LIBNOTMUCH_MAJOR_VERSION >= 5
-+  unsigned int count = 0;
-+  unsigned int tmp;
-+  if (notmuch_query_count_messages (queries[0], &tmp) == NOTMUCH_STATUS_SUCCESS)
-+      count += tmp;
-+  if (notmuch_query_count_messages (queries[1], &tmp) == NOTMUCH_STATUS_SUCCESS)
-+      count += tmp;
- #else
-   unsigned int count = notmuch_query_count_messages (queries[0])
-                      + notmuch_query_count_messages (queries[1]);
-@@ -233,6 +240,13 @@ run_queries (notmuch_database_t *db,
- #if LIBNOTMUCH_MAJOR_VERSION >= 4 && LIBNOTMUCH_MINOR_VERSION >= 3
-       if (notmuch_query_search_messages_st (queries[i], &messages) != NOTMUCH_STATUS_SUCCESS)
-           continue;
-+#elif LIBNOTMUCH_MAJOR_VERSION >= 5
-+  unsigned int count = 0;
-+  unsigned int tmp;
-+  if (notmuch_query_count_messages (queries[0], &tmp) == NOTMUCH_STATUS_SUCCESS)
-+      count += tmp;
-+  if (notmuch_query_count_messages (queries[1], &tmp) == NOTMUCH_STATUS_SUCCESS)
-+      count += tmp;
- #else
-       if (!(messages = notmuch_query_search_messages (queries[i])))
-           continue;
---
-2.13.3
-
diff --git a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
index f5d48d03c96a..c2cce227576a 100644
--- a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
@@ -1,32 +1,28 @@
 { stdenv, fetchFromGitHub, pkgconfig, glib, notmuch }:
 
+let
+  version = "9";
+in
 stdenv.mkDerivation rec {
   name = "notmuch-addrlookup-${version}";
-  version = "7";
 
   src = fetchFromGitHub {
     owner = "aperezdc";
     repo = "notmuch-addrlookup-c";
     rev ="v${version}";
-    sha256 = "0mz0llf1ggl1k46brgrqj3i8qlg1ycmkc5a3a0kg8fg4s1c1m6xk";
+    sha256 = "1j3zdx161i1x4w0nic14ix5i8hd501rb31daf8api0k8855sx4rc";
   };
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ glib notmuch ];
 
-  # Required until notmuch-addrlookup can be compiled against notmuch >= 0.25
-  patches = [ ./0001-notmuch-0.25-compatibility-fix.patch ];
-
-  installPhase = ''
-    mkdir -p "$out/bin"
-    cp notmuch-addrlookup "$out/bin"
-  '';
+  installPhase = "install -D notmuch-addrlookup $out/bin/notmuch-addrlookup";
 
   meta = with stdenv.lib; {
     description = "Address lookup tool for Notmuch in C";
     homepage = https://github.com/aperezdc/notmuch-addrlookup-c;
     maintainers = with maintainers; [ mog garbas ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     license = licenses.mit;
   };
 }
diff --git a/pkgs/applications/networking/offrss/default.nix b/pkgs/applications/networking/offrss/default.nix
index 75ed084c2853..af6a4dfddc1b 100644
--- a/pkgs/applications/networking/offrss/default.nix
+++ b/pkgs/applications/networking/offrss/default.nix
@@ -8,18 +8,14 @@ stdenv.mkDerivation {
     cp offrss $out/bin
   '';
 
-  crossAttrs = {
-    propagatedBuildInputs = [ curl.crossDrv libmrss.crossDrv ];
-    preConfigure = ''
-      sed 's/^PDF/#PDF/' -i Makefile
-    '';
-  };
-
-  buildInputs = [ curl libmrss podofo ]
+  buildInputs = [ curl libmrss ]
+    ++ stdenv.lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) podofo
     ++ stdenv.lib.optional (!stdenv.isLinux) libiconv;
 
   configurePhase = stdenv.lib.optionalString (!stdenv.isLinux) ''
     sed 's/#EXTRA/EXTRA/' -i Makefile
+  '' + stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+    sed 's/^PDF/#PDF/' -i Makefile
   '';
 
   src = fetchurl {
diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix
index 686e93b5d5e2..ee646fee2c25 100644
--- a/pkgs/applications/science/math/sage/default.nix
+++ b/pkgs/applications/science/math/sage/default.nix
@@ -29,6 +29,7 @@
 , texlive
 , texinfo
 , hevea
+, buildDocs ? false
 }:
 
 stdenv.mkDerivation rec {
@@ -87,7 +88,7 @@ stdenv.mkDerivation rec {
     # Sage installs during first `make`, `make install` is no-op and just takes time.
   '';
 
-  outputs = [ "out" "doc" ];
+  outputs = [ "out" ] ++ stdenv.lib.optionals (buildDocs) [ "doc" ];
 
   buildInputs = [
     bash # needed for the build
@@ -135,13 +136,16 @@ stdenv.mkDerivation rec {
     # TODO could be patched with `sed s|printf(ctime(\(.*\)))|%s... or fixed upstream
   ];
 
+  configureFlags = stdenv.lib.optionals(buildDocs) [ "--docdir=$(doc)" ];
   preConfigure = ''
-    export SAGE_NUM_THREADS=$NIX_BUILD_CORES
+    export SAGE_NUM_THREADS="$NIX_BUILD_CORES"
     export SAGE_ATLAS_ARCH=fast
 
-    export HOME=$out/sage-home
-    mkdir -p $out/sage-home
+    export HOME=/tmp/sage-home
+    export SAGE_ROOT="$PWD"
+    export SAGE_SRC="$PWD"
 
+    mkdir -p "$HOME"
     mkdir -p "$out"
 
     # we need to keep the source around
@@ -150,12 +154,18 @@ stdenv.mkDerivation rec {
     mv "$dir" "$out/sage-root"
 
     cd "$out/sage-root" # build in target dir, since `make` is also `make install`
+  ''
+  + stdenv.lib.optionalString (buildDocs) ''
+    mkdir -p "$doc"
+    export SAGE_DOC="$doc"
+    export SAGE_DOCBUILD_OPTS="--no-pdf-links -k"
+    export SAGE_SPKG_INSTALL_DOCS='no'
   '';
 
+  buildFlags = if (buildDocs) then "doc" else "build";
+
   # for reference: http://doc.sagemath.org/html/en/installation/source.html
   preBuild = ''
-    # TODO do this conditionally
-    export SAGE_SPKG_INSTALL_DOCS='no'
     # symlink python to make sure the shebangs are patched to the sage path
     # while still being able to use python before building it
     # (this is important because otherwise sage will try to install python
@@ -167,10 +177,15 @@ stdenv.mkDerivation rec {
   '';
 
   postBuild = ''
+    # Clean up
     rm -r "$out/sage-root/upstream" # don't keep the sources of all the spkgs
-    rm -r "$out/sage-root/src/build"
-    rm -rf "$out/sage-root/src/.git"
+    rm -rf "$out/sage-root/src/build"
+    rm -rf "$out/sage-root/src/autom4te.cache"
+    rm -rf "$out/sage-root/src/config"
+    rm -rf "$out/sage-root/src/m4"
+    rm -rf "$out/sage-root/.git"
     rm -r "$out/sage-root/logs"
+    rm -r "$out"/lib/python*/test
     # Fix dependency cycle between out and doc
     rm -f "$out/sage-root/config.log"
     rm -f "$out/sage-root/config.status"
diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix
index d39c81400100..a34afbab55e6 100644
--- a/pkgs/applications/version-management/smartgithg/default.nix
+++ b/pkgs/applications/version-management/smartgithg/default.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   name = "smartgithg-${version}";
-  version = "17_1_1";
+  version = "17_1_4";
 
   src = fetchurl {
-    url = "http://www.syntevo.com/static/smart/download/smartgit/smartgit-linux-${version}.tar.gz";
-    sha256 = "1zc1cs9gxv9498jp1nhi9z70dv9dzv0yh5f3bd89wi5zvcwly3d0";
+    url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${version}.tar.gz";
+    sha256 = "1x8s1mdxg7m3fy3izgnb1smrn4ng3q31x0sqnjlchkb5vx7gp5rh";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/build-support/rust/build-rust-crate.nix b/pkgs/build-support/rust/build-rust-crate.nix
index e36fab36bf97..f1f344ca3c7d 100644
--- a/pkgs/build-support/rust/build-rust-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate.nix
@@ -291,6 +291,7 @@ let buildCrate = { crateName, crateVersion, crateAuthors, buildDependencies,
         mkdir -p $out/bin
         cp -P target/bin/* $out/bin # */
       fi
+      runHook postInstall
     '';
 in
 
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c242f65b2b16..3b36c6d6318d 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -950,7 +950,7 @@ self: super: {
   ChasingBottoms = dontCheck super.ChasingBottoms;
 
   # Add support for https://github.com/haskell-hvr/multi-ghc-travis.
-  multi-ghc-travis = self.callPackage ../tools/haskell/multi-ghc-travis { ShellCheck = self.ShellCheck_0_4_6; };
+  multi-ghc-travis = self.callPackage ../tools/haskell/multi-ghc-travis {};
 
   # https://github.com/yesodweb/Shelly.hs/issues/162
   shelly = dontCheck super.shelly;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index ab487eb6edf5..488d3206c78c 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -61,7 +61,7 @@ self: super: {
   ##       callStackDoc, called at compiler/utils/Outputable.hs:1150:37 in ghc:Outputable
   ##       pprPanic, called at utils/haddock/haddock-api/src/Haddock/Interface/Create.hs:1013:16 in main:Haddock.Interface.Create
   ## Please report this as a GHC bug:  http://www.haskell.org/ghc/reportabug
-  hspec = dontHaddock (dontCheck super.hspec_2_4_7);        # test suite causes an infinite loop
+  hspec = dontHaddock (dontCheck super.hspec_2_4_8);        # test suite causes an infinite loop
 
   ## Setup: Encountered missing dependencies:
   ## QuickCheck >=2.3 && <2.10
@@ -88,7 +88,7 @@ self: super: {
   ##       from the context: a
   constraints = super.constraints_0_10;
 
-  hspec-core = overrideCabal super.hspec-core_2_4_7 (drv: {
+  hspec-core = overrideCabal super.hspec-core_2_4_8 (drv: {
     ## Needs bump to a versioned attribute
     ## 
     ##     • No instance for (Semigroup Summary)
@@ -102,7 +102,7 @@ self: super: {
   ## breaks hspec:
   ## Setup: Encountered missing dependencies:
   ## hspec-discover ==2.4.7
-  hspec-discover = super.hspec-discover_2_4_7;
+  hspec-discover = super.hspec-discover_2_4_8;
 
   ## Needs bump to a versioned attribute
   ## 
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 4ab9669094aa..02286e7762ae 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -38,7 +38,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 10.4
+  # LTS Haskell 10.5
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -64,7 +64,7 @@ default-package-overrides:
   - adler32 ==0.1.1.0
   - aern2-mp ==0.1.2.0
   - aern2-real ==0.1.1.0
-  - aeson ==1.2.3.0
+  - aeson ==1.2.4.0
   - aeson-better-errors ==0.9.1.0
   - aeson-casing ==0.1.0.5
   - aeson-compat ==0.3.7.1
@@ -256,8 +256,9 @@ default-package-overrides:
   - bencode ==0.6.0.0
   - bento ==0.1.0
   - between ==0.11.0.0
+  - bhoogle ==0.1.2.5
   - bibtex ==0.1.0.6
-  - bifunctors ==5.5
+  - bifunctors ==5.5.2
   - bimap ==0.3.3
   - bimap-server ==0.1.0.1
   - binary-bits ==0.5
@@ -305,7 +306,7 @@ default-package-overrides:
   - blaze-markup ==0.8.2.0
   - blaze-svg ==0.3.6.1
   - blaze-textual ==0.2.1.0
-  - bloodhound ==0.15.0.1
+  - bloodhound ==0.15.0.2
   - bloomfilter ==2.0.1.0
   - blosum ==0.1.1.4
   - bmp ==1.2.6.3
@@ -348,10 +349,10 @@ default-package-overrides:
   - bzlib-conduit ==0.2.1.5
   - c2hs ==0.28.3
   - Cabal ==2.0.1.1
-  - cabal-doctest ==1.0.5
+  - cabal-doctest ==1.0.6
   - cabal-file-th ==0.2.4
   - cabal-rpm ==0.12
-  - cabal-toolkit ==0.0.4
+  - cabal-toolkit ==0.0.5
   - cache ==0.1.0.1
   - cairo ==0.13.4.2
   - calendar-recycling ==0.0
@@ -428,7 +429,7 @@ default-package-overrides:
   - combinatorial ==0.0
   - comfort-graph ==0.0.2.1
   - commutative ==0.0.1.4
-  - comonad ==5.0.2
+  - comonad ==5.0.3
   - comonads-fd ==4.0
   - comonad-transformers ==4.0
   - compact ==0.1.0.1
@@ -439,19 +440,19 @@ default-package-overrides:
   - composable-associations-aeson ==0.1.0.0
   - composition ==1.0.2.1
   - composition-extra ==2.0.0
-  - concise ==0.1.0.0
+  - concise ==0.1.0.1
   - concurrency ==1.2.3.0
   - concurrent-extra ==0.7.0.11
-  - concurrent-output ==1.10.2
+  - concurrent-output ==1.10.3
   - concurrent-split ==0.0.1
   - concurrent-supply ==0.1.8
   - cond ==0.4.1.1
   - conduit ==1.2.13
   - conduit-algorithms ==0.0.7.1
   - conduit-combinators ==1.1.2
-  - conduit-connection ==0.1.0.3
+  - conduit-connection ==0.1.0.4
   - conduit-extra ==1.2.3.2
-  - conduit-iconv ==0.1.1.2
+  - conduit-iconv ==0.1.1.3
   - conduit-parse ==0.1.2.2
   - conduit-throttle ==0.3.1.0
   - ConfigFile ==1.1.4
@@ -508,7 +509,7 @@ default-package-overrides:
   - crypt-sha512 ==0
   - csp ==1.3.1
   - css-syntax ==0.0.5
-  - css-text ==0.1.2.2
+  - css-text ==0.1.3.0
   - csv ==0.1.2
   - csv-conduit ==0.6.7
   - ctrie ==0.2
@@ -560,7 +561,7 @@ default-package-overrides:
   - data-textual ==0.3.0.2
   - data-tree-print ==0.1.0.0
   - dataurl ==0.1.0.0
-  - DAV ==1.3.1
+  - DAV ==1.3.2
   - dawg-ord ==0.5.1.0
   - dbcleaner ==0.1.3
   - dbus ==0.10.15
@@ -581,7 +582,7 @@ default-package-overrides:
   - dhall-bash ==1.0.6
   - dhall-json ==1.0.9
   - dhall-nix ==1.0.9
-  - dhall-text ==1.0.4
+  - dhall-text ==1.0.5
   - diagrams ==1.4
   - diagrams-builder ==0.8.0.2
   - diagrams-cairo ==1.4
@@ -607,7 +608,7 @@ default-package-overrides:
   - disk-free-space ==0.1.0.1
   - disposable ==0.2.0.4
   - distance ==0.1.0.0
-  - distributed-closure ==0.3.4.0
+  - distributed-closure ==0.3.5
   - distributed-process ==0.7.3
   - distributed-process-simplelocalnet ==0.2.4
   - distributed-process-tests ==0.4.11
@@ -709,7 +710,7 @@ default-package-overrides:
   - eventstore ==0.15.0.2
   - every ==0.0.1
   - exact-combinatorics ==0.2.0.8
-  - exact-pi ==0.4.1.2
+  - exact-pi ==0.4.1.3
   - exceptional ==0.3.0.0
   - exception-mtl ==0.4.0.1
   - exceptions ==0.8.3
@@ -731,7 +732,7 @@ default-package-overrides:
   - fasta ==0.10.4.2
   - fast-builder ==0.0.1.0
   - fast-digits ==0.2.1.0
-  - fast-logger ==2.4.10
+  - fast-logger ==2.4.11
   - fast-math ==1.0.2
   - fb ==1.1.1
   - fclabels ==2.0.3.2
@@ -773,7 +774,7 @@ default-package-overrides:
   - focus ==0.1.5.2
   - fold-debounce ==0.2.0.6
   - fold-debounce-conduit ==0.1.0.5
-  - foldl ==1.3.5
+  - foldl ==1.3.7
   - folds ==0.7.4
   - follow-file ==0.0.2
   - FontyFruity ==0.5.3.3
@@ -788,7 +789,7 @@ default-package-overrides:
   - Frames ==0.3.0.2
   - free ==4.12.4
   - freenect ==1.2.1
-  - freer-simple ==1.0.0.0
+  - freer-simple ==1.0.1.1
   - freetype2 ==0.1.2
   - free-vl ==0.1.4
   - friday ==0.2.3.1
@@ -802,7 +803,7 @@ default-package-overrides:
   - funcmp ==1.8
   - functor-classes-compat ==1
   - fuzzcheck ==0.1.1
-  - fuzzyset ==0.1.0.4
+  - fuzzyset ==0.1.0.6
   - gauge ==0.1.3
   - gd ==3000.7.3
   - gdax ==0.6.0.0
@@ -818,7 +819,7 @@ default-package-overrides:
   - generics-sop ==0.3.2.0
   - generics-sop-lens ==0.1.2.1
   - generic-xmlpickler ==0.1.0.5
-  - geniplate-mirror ==0.7.5
+  - geniplate-mirror ==0.7.6
   - genvalidity ==0.4.0.4
   - genvalidity-aeson ==0.1.0.0
   - genvalidity-bytestring ==0.1.0.0
@@ -840,15 +841,15 @@ default-package-overrides:
   - ghc-compact ==0.1.0.0
   - ghc-core ==0.5.6
   - ghc-events ==0.7.0
-  - ghc-exactprint ==0.5.5.0
-  - ghcid ==0.6.9
+  - ghc-exactprint ==0.5.6.0
+  - ghcid ==0.6.10
   - ghcjs-base-stub ==0.1.0.4
   - ghcjs-codemirror ==0.0.0.1
   - ghcjs-dom ==0.9.2.0
   - ghcjs-dom-jsaddle ==0.9.2.0
   - ghcjs-perch ==0.3.3.2
   - ghc-paths ==0.1.0.9
-  - ghc-prof ==1.4.0.4
+  - ghc-prof ==1.4.1
   - ghc-syb-utils ==0.2.3.3
   - ghc-tcplugins-extra ==0.2.2
   - ghc-typelits-extra ==0.2.4
@@ -864,7 +865,7 @@ default-package-overrides:
   - giphy-api ==0.5.2.0
   - git ==0.2.1
   - github ==0.18
-  - github-release ==1.1.2
+  - github-release ==1.1.3
   - github-types ==0.2.1
   - github-webhook-handler ==0.0.8
   - github-webhook-handler-snap ==0.0.7
@@ -1027,12 +1028,12 @@ default-package-overrides:
   - hamlet ==1.2.0
   - HandsomeSoup ==0.4.2
   - handwriting ==0.1.0.3
-  - hapistrano ==0.3.5.1
+  - hapistrano ==0.3.5.2
   - happstack-hsp ==7.3.7.3
   - happstack-jmacro ==7.0.12
   - happstack-server ==7.5.0.1
-  - happstack-server-tls ==7.1.6.4
-  - happy ==1.19.8
+  - happstack-server-tls ==7.1.6.5
+  - happy ==1.19.9
   - harp ==0.4.3
   - hasbolt ==0.1.3.0
   - hashable ==1.2.6.1
@@ -1094,7 +1095,7 @@ default-package-overrides:
   - heaps ==0.3.6
   - heatshrink ==0.1.0.0
   - hebrew-time ==0.1.1
-  - hedgehog ==0.5.1
+  - hedgehog ==0.5.2
   - hedgehog-quickcheck ==0.1
   - hedis ==0.9.12
   - here ==1.2.12
@@ -1144,13 +1145,13 @@ default-package-overrides:
   - hosc ==0.16
   - hostname ==1.0
   - hostname-validate ==1.0.0
-  - hourglass ==0.2.10
+  - hourglass ==0.2.11
   - hourglass-orphans ==0.1.0.0
   - hp2pretty ==0.8.0.2
   - hpack ==0.21.2
   - hpc-coveralls ==1.0.10
   - HPDF ==1.4.10
-  - hpio ==0.9.0.3
+  - hpio ==0.9.0.5
   - hpp ==0.5.1
   - hpqtypes ==1.5.1.1
   - hprotoc ==2.4.6
@@ -1162,12 +1163,12 @@ default-package-overrides:
   - hsb2hs ==0.3.1
   - hs-bibutils ==6.2.0.1
   - hscolour ==1.24.2
-  - hsdns ==1.7
+  - hsdns ==1.7.1
   - hsebaysdk ==0.4.0.0
   - hse-cpp ==0.2
   - hsemail ==2
-  - HSet ==0.0.1
   - hset ==2.2.0
+  - HSet ==0.0.1
   - hsexif ==0.6.1.5
   - hs-GeoIP ==0.3
   - hsignal ==0.2.7.5
@@ -1203,7 +1204,7 @@ default-package-overrides:
   - hstatsd ==0.1
   - HStringTemplate ==0.8.6
   - HSvm ==0.1.0.3.22
-  - hsx2hs ==0.14.1.1
+  - hsx2hs ==0.14.1.2
   - hsx-jmacro ==7.3.8
   - hsyslog ==5.0.1
   - hsyslog-udp ==0.2.0
@@ -1216,15 +1217,15 @@ default-package-overrides:
   - htoml ==1.0.0.3
   - HTTP ==4000.3.9
   - http2 ==1.6.3
-  - http-api-data ==0.3.7.1
-  - http-client ==0.5.9
+  - http-api-data ==0.3.7.2
+  - http-client ==0.5.10
   - http-client-openssl ==0.2.1.1
-  - http-client-tls ==0.3.5.1
+  - http-client-tls ==0.3.5.3
   - http-common ==0.8.2.0
   - http-conduit ==2.2.4
   - http-date ==0.0.6.1
   - http-link-header ==1.0.3
-  - http-media ==0.7.1.1
+  - http-media ==0.7.1.2
   - http-reverse-proxy ==0.4.5
   - http-streams ==0.8.5.5
   - http-types ==0.9.1
@@ -1274,7 +1275,7 @@ default-package-overrides:
   - IfElse ==0.85
   - iff ==0.0.6
   - ignore ==0.1.1.0
-  - ihs ==0.1.0.1
+  - ihs ==0.1.0.2
   - ilist ==0.3.1.0
   - imagesize-conduit ==1.1
   - Imlib ==0.1.2
@@ -1286,7 +1287,7 @@ default-package-overrides:
   - indentation-parsec ==0.0.0.1
   - indents ==0.4.0.1
   - inflections ==0.4.0.1
-  - influxdb ==1.2.2.2
+  - influxdb ==1.2.2.3
   - ini ==0.3.5
   - inline-c ==0.6.0.5
   - inline-c-cpp ==0.2.1.0
@@ -1300,8 +1301,8 @@ default-package-overrides:
   - intern ==0.9.1.4
   - interpolate ==0.1.1
   - interpolatedstring-perl6 ==1.0.0
-  - interpolation ==0.1.0.2
   - Interpolation ==0.3.0
+  - interpolation ==0.1.0.2
   - IntervalMap ==0.5.3.1
   - intervals ==0.8.1
   - intro ==0.3.1.0
@@ -1322,8 +1323,8 @@ default-package-overrides:
   - IPv6DB ==0.2.4
   - ipython-kernel ==0.9.0.1
   - irc ==0.6.1.0
-  - irc-client ==1.0.1.0
-  - irc-conduit ==0.2.2.4
+  - irc-client ==1.0.1.1
+  - irc-conduit ==0.2.2.5
   - irc-ctcp ==0.1.3.0
   - irc-dcc ==2.0.1
   - islink ==0.1.0.0
@@ -1354,7 +1355,7 @@ default-package-overrides:
   - json-rpc-generic ==0.2.1.3
   - json-schema ==0.7.4.1
   - json-stream ==0.4.1.5
-  - JuicyPixels ==3.2.9.3
+  - JuicyPixels ==3.2.9.4
   - JuicyPixels-extra ==0.2.2
   - JuicyPixels-scale-dct ==0.1.1.2
   - justified-containers ==0.2.0.1
@@ -1364,7 +1365,7 @@ default-package-overrides:
   - kanji ==3.0.2
   - kansas-comet ==0.4
   - katip ==0.5.2.0
-  - katip-elasticsearch ==0.4.0.3
+  - katip-elasticsearch ==0.4.0.4
   - katydid ==0.1.1.0
   - kawhi ==0.3.0
   - kdt ==0.2.4
@@ -1386,7 +1387,7 @@ default-package-overrides:
   - language-haskell-extract ==0.2.4
   - language-java ==0.2.8
   - language-javascript ==0.6.0.10
-  - language-puppet ==1.3.13
+  - language-puppet ==1.3.14
   - lapack-carray ==0.0
   - lapack-ffi ==0.0
   - lapack-ffi-tools ==0.0.0.1
@@ -1396,7 +1397,7 @@ default-package-overrides:
   - lattices ==1.7
   - lazyio ==0.1.0.4
   - lazysmallcheck ==0.6
-  - lca ==0.3
+  - lca ==0.3.1
   - leancheck ==0.7.0
   - leapseconds-announced ==2017.1.0.1
   - lens ==4.15.4
@@ -1448,10 +1449,10 @@ default-package-overrides:
   - log-elasticsearch ==0.9.1.0
   - logfloat ==0.13.3.3
   - logger-thread ==0.1.0.2
-  - logging-effect ==1.2.1
-  - logging-effect-extra ==1.2.1
-  - logging-effect-extra-file ==1.1.1
-  - logging-effect-extra-handler ==1.1.1
+  - logging-effect ==1.2.3
+  - logging-effect-extra ==1.2.2
+  - logging-effect-extra-file ==1.1.2
+  - logging-effect-extra-handler ==1.1.2
   - logging-facade ==0.3.0
   - logging-facade-syslog ==1
   - logict ==0.6.0.2
@@ -1498,7 +1499,7 @@ default-package-overrides:
   - megaparsec ==6.3.0
   - mega-sdist ==0.3.0.6
   - memory ==0.14.11
-  - MemoTrie ==0.6.8
+  - MemoTrie ==0.6.9
   - mercury-api ==0.1.0.1
   - mersenne-random-pure64 ==0.2.2.0
   - messagepack ==0.5.4
@@ -1520,7 +1521,7 @@ default-package-overrides:
   - midi ==0.2.2.1
   - midi-music-box ==0.0.0.4
   - mighty-metropolis ==1.2.0
-  - milena ==0.5.2.0
+  - milena ==0.5.2.1
   - mime-mail ==0.4.14
   - mime-mail-ses ==0.4.0.0
   - mime-types ==0.1.0.7
@@ -1556,7 +1557,7 @@ default-package-overrides:
   - monadloc ==0.7.1
   - monad-logger ==0.3.28.1
   - monad-logger-json ==0.1.0.0
-  - monad-logger-prefix ==0.1.6
+  - monad-logger-prefix ==0.1.7
   - monad-logger-syslog ==0.1.4.0
   - monad-loops ==0.4.3
   - monad-memo ==0.4.1
@@ -1578,7 +1579,7 @@ default-package-overrides:
   - monad-time ==0.2
   - monad-unlift ==0.2.0
   - monad-unlift-ref ==0.2.1
-  - mongoDB ==2.3.0.1
+  - mongoDB ==2.3.0.2
   - monoidal-containers ==0.3.0.2
   - monoid-extras ==0.4.2
   - monoid-subclasses ==0.4.4
@@ -1599,7 +1600,7 @@ default-package-overrides:
   - murmur-hash ==0.1.0.9
   - MusicBrainz ==0.3.1
   - mustache ==2.3.0
-  - mutable-containers ==0.3.3
+  - mutable-containers ==0.3.4
   - mwc-probability ==1.3.0
   - mwc-random ==0.13.6.0
   - mwc-random-accelerate ==0.1.0.0
@@ -1614,7 +1615,7 @@ default-package-overrides:
   - nano-erl ==0.1.0.1
   - nanospec ==0.2.2
   - naqsha ==0.2.0.1
-  - nats ==1.1.1
+  - nats ==1.1.2
   - natural-sort ==0.1.2
   - natural-transformation ==0.4
   - ndjson-conduit ==0.1.0.5
@@ -1630,7 +1631,7 @@ default-package-overrides:
   - network-anonymous-i2p ==0.10.0
   - network-anonymous-tor ==0.11.0
   - network-attoparsec ==0.12.2
-  - network-carbon ==1.0.10
+  - network-carbon ==1.0.11
   - network-conduit-tls ==1.2.2
   - network-house ==0.1.0.2
   - network-info ==0.2.0.9
@@ -1684,7 +1685,7 @@ default-package-overrides:
   - once ==0.2
   - one-liner ==0.9.2
   - OneTuple ==0.2.1
-  - online ==0.2.0
+  - online ==0.2.1.0
   - Only ==0.1
   - oo-prototypes ==0.1.0.0
   - opaleye ==0.6.0.0
@@ -1721,7 +1722,7 @@ default-package-overrides:
   - parallel ==3.2.1.1
   - parallel-io ==0.3.3
   - parseargs ==0.2.0.8
-  - parsec ==3.1.11
+  - parsec ==3.1.13.0
   - parsec-numeric ==0.1.0.0
   - ParsecTools ==0.0.2.0
   - parser-combinators ==0.4.0
@@ -1760,7 +1761,7 @@ default-package-overrides:
   - persistent-postgresql ==2.6.3
   - persistent-refs ==0.4
   - persistent-sqlite ==2.6.4
-  - persistent-template ==2.5.3
+  - persistent-template ==2.5.3.1
   - pgp-wordlist ==0.1.0.2
   - pg-transact ==0.1.0.1
   - phantom-state ==0.2.1.2
@@ -1775,7 +1776,7 @@ default-package-overrides:
   - pipes-attoparsec ==0.5.1.5
   - pipes-bytestring ==2.1.6
   - pipes-category ==0.3.0.0
-  - pipes-concurrency ==2.0.8
+  - pipes-concurrency ==2.0.9
   - pipes-csv ==1.4.3
   - pipes-extras ==1.0.12
   - pipes-fastx ==0.3.0.0
@@ -1842,7 +1843,7 @@ default-package-overrides:
   - primitive ==0.6.3.0
   - printcess ==0.1.0.3
   - probability ==0.2.5.1
-  - process-extras ==0.7.3
+  - process-extras ==0.7.4
   - product-isomorphic ==0.0.3.1
   - product-profunctors ==0.8.0.3
   - profiterole ==0.1
@@ -1876,7 +1877,7 @@ default-package-overrides:
   - pure-io ==0.2.1
   - pureMD5 ==2.1.3
   - purescript-bridge ==0.11.1.2
-  - pusher-http-haskell ==1.5.1.0
+  - pusher-http-haskell ==1.5.1.2
   - pwstore-fast ==2.4.4
   - qchas ==1.0.1.0
   - qm-interpolated-string ==0.2.1.0
@@ -1885,7 +1886,7 @@ default-package-overrides:
   - QuickCheck ==2.10.1
   - quickcheck-arbitrary-adt ==0.2.0.0
   - quickcheck-assertions ==0.3.0
-  - quickcheck-classes ==0.3.1
+  - quickcheck-classes ==0.3.2
   - quickcheck-combinators ==0.0.2
   - quickcheck-instances ==0.3.16.1
   - quickcheck-io ==0.2.0
@@ -1979,7 +1980,7 @@ default-package-overrides:
   - rest-wai ==0.2.0.1
   - result ==0.2.6.0
   - rethinkdb-client-driver ==0.0.25
-  - retry ==0.7.5.1
+  - retry ==0.7.6.0
   - rev-state ==0.1.2
   - rfc5051 ==0.1.0.3
   - riak ==1.1.2.3
@@ -2007,8 +2008,8 @@ default-package-overrides:
   - say ==0.1.0.0
   - sbp ==2.3.6
   - sbv ==7.4
-  - SCalendar ==1.1.0
   - scalendar ==1.2.0
+  - SCalendar ==1.1.0
   - scalpel ==0.5.1
   - scalpel-core ==0.5.1
   - scanner ==0.2
@@ -2029,11 +2030,11 @@ default-package-overrides:
   - selda-sqlite ==0.1.6.0
   - semigroupoid-extras ==5
   - semigroupoids ==5.2.1
-  - semigroups ==0.18.3
+  - semigroups ==0.18.4
   - semiring-simple ==1.0.0.1
   - semver ==0.3.3.1
   - sendfile ==0.7.9
-  - sensu-run ==0.4.0.3
+  - sensu-run ==0.4.0.4
   - seqalign ==0.2.0.4
   - seqloc ==0.6.1.1
   - serf ==0.1.1.0
@@ -2079,7 +2080,7 @@ default-package-overrides:
   - SHA ==1.6.4.2
   - shake ==0.16
   - shake-language-c ==0.11.0
-  - shakespeare ==2.0.14.1
+  - shakespeare ==2.0.15
   - shell-conduit ==4.6.1
   - shell-escape ==0.2.0
   - shelly ==1.7.0.1
@@ -2092,7 +2093,7 @@ default-package-overrides:
   - simple ==0.11.2
   - simple-log ==0.9.3
   - simple-reflect ==0.3.2
-  - simple-sendfile ==0.2.26
+  - simple-sendfile ==0.2.27
   - simple-session ==0.10.1.1
   - simple-templates ==0.8.0.1
   - singleton-bool ==0.1.2.0
@@ -2156,7 +2157,7 @@ default-package-overrides:
   - StateVar ==1.1.0.4
   - stateWriter ==0.2.10
   - statistics ==0.14.0.2
-  - stm ==2.4.4.1
+  - stm ==2.4.5.0
   - stm-chans ==3.0.0.4
   - stm-conduit ==3.0.0
   - stm-containers ==0.2.16
@@ -2179,7 +2180,7 @@ default-package-overrides:
   - Stream ==0.4.7.2
   - streaming ==0.2.0.0
   - streaming-bytestring ==0.1.5
-  - streaming-commons ==0.1.18
+  - streaming-commons ==0.1.19
   - streamly ==0.1.0
   - streamproc ==1.6.2
   - streams ==3.3
@@ -2211,7 +2212,7 @@ default-package-overrides:
   - svg-tree ==0.6.2.1
   - swagger ==0.3.0
   - swagger2 ==2.2
-  - swagger-petstore ==0.0.1.7
+  - swagger-petstore ==0.0.1.8
   - swish ==0.9.1.10
   - syb ==0.7
   - syb-with-class ==0.6.1.8
@@ -2233,7 +2234,7 @@ default-package-overrides:
   - tar-conduit ==0.1.1
   - tardis ==0.4.1.0
   - tasty ==0.11.3
-  - tasty-ant-xml ==1.1.2
+  - tasty-ant-xml ==1.1.3
   - tasty-auto ==0.2.0.0
   - tasty-dejafu ==0.7.1.1
   - tasty-discover ==4.1.3
@@ -2247,7 +2248,7 @@ default-package-overrides:
   - tasty-kat ==0.0.3
   - tasty-program ==1.0.5
   - tasty-quickcheck ==0.9.1
-  - tasty-rerun ==1.1.9
+  - tasty-rerun ==1.1.10
   - tasty-silver ==3.1.11
   - tasty-smallcheck ==0.8.1
   - tasty-stats ==0.2.0.3
@@ -2282,7 +2283,7 @@ default-package-overrides:
   - text-generic-pretty ==1.2.1
   - text-icu ==0.7.0.1
   - text-latin1 ==0.3
-  - text-ldap ==0.1.1.10
+  - text-ldap ==0.1.1.11
   - textlocal ==0.1.0.5
   - text-manipulate ==0.2.0.1
   - text-metrics ==0.3.0
@@ -2301,7 +2302,7 @@ default-package-overrides:
   - these ==0.7.4
   - th-expand-syns ==0.4.4.0
   - th-extras ==0.0.0.4
-  - th-lift ==0.7.7
+  - th-lift ==0.7.8
   - th-lift-instances ==0.1.11
   - th-orphans ==0.13.5
   - thread-hierarchy ==0.3.0.0
@@ -2385,7 +2386,7 @@ default-package-overrides:
   - type-level-kv-list ==1.1.0
   - type-level-numbers ==0.1.1.1
   - typelits-witnesses ==0.2.3.0
-  - type-of-html ==1.3.2.1
+  - type-of-html ==1.3.3.0
   - type-operators ==0.1.0.4
   - type-spec ==0.3.0.1
   - typography-geometry ==1.0.0.1
@@ -2409,8 +2410,8 @@ default-package-overrides:
   - union-find ==0.2
   - uniplate ==1.6.12
   - uniq-deep ==1.1.0.0
-  - unique ==0
   - Unique ==0.4.7.2
+  - unique ==0
   - unit-constraint ==0.0.0
   - units-parser ==0.1.1.2
   - universe ==1.0
@@ -2465,7 +2466,7 @@ default-package-overrides:
   - vcswrapper ==0.1.6
   - vector ==0.12.0.1
   - vector-algorithms ==0.7.0.1
-  - vector-binary-instances ==0.2.3.5
+  - vector-binary-instances ==0.2.4
   - vector-buffer ==0.4.1
   - vector-builder ==0.3.4.1
   - vector-fftw ==0.1.3.8
@@ -2504,7 +2505,7 @@ default-package-overrides:
   - wai-middleware-crowd ==0.1.4.2
   - wai-middleware-metrics ==0.2.4
   - wai-middleware-prometheus ==0.3.0
-  - wai-middleware-rollbar ==0.8.2
+  - wai-middleware-rollbar ==0.8.3
   - wai-middleware-static ==0.8.1
   - wai-middleware-throttle ==0.2.2.0
   - wai-predicates ==0.10.0
@@ -2523,12 +2524,12 @@ default-package-overrides:
   - webdriver-angular ==0.1.11
   - webpage ==0.0.5
   - web-plugins ==0.2.9
-  - web-routes ==0.27.13
+  - web-routes ==0.27.14
   - web-routes-boomerang ==0.28.4.2
   - web-routes-happstack ==0.23.11
   - web-routes-hsp ==0.24.6.1
   - web-routes-th ==0.22.6.2
-  - web-routes-wai ==0.24.3
+  - web-routes-wai ==0.24.3.1
   - webrtc-vad ==0.1.0.3
   - websockets ==0.12.3.1
   - websockets-rpc ==0.6.0
@@ -2542,7 +2543,7 @@ default-package-overrides:
   - Win32 ==2.5.4.1
   - Win32-notify ==0.3.0.3
   - wire-streams ==0.1.1.0
-  - withdependencies ==0.2.4.1
+  - withdependencies ==0.2.4.2
   - witherable ==0.2
   - with-location ==0.1.0
   - witness ==0.4
@@ -2580,7 +2581,7 @@ default-package-overrides:
   - xeno ==0.3.2
   - xenstore ==0.1.1
   - xhtml ==3000.2.2
-  - xls ==0.1.0
+  - xls ==0.1.1
   - xlsx ==0.6.0
   - xlsx-tabular ==0.2.2
   - xml ==1.3.14
@@ -2705,7 +2706,6 @@ extra-packages:
   - QuickCheck < 2                      # required by test-framework-quickcheck and its users
   - seqid < 0.2                         # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
   - seqid-streams < 0.2                 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
-  - ShellCheck == 0.4.6                 # required by multi-ghc-travis
   - split < 0.2                         # newer versions don't work with GHC 6.12.3
   - tar < 0.4.2.0                       # later versions don't work with GHC < 7.6.x
   - transformers == 0.4.3.*             # the latest version isn't supported by mtl yet
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index f330561b1451..773664efb428 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -543,8 +543,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "ANum";
-       version = "0.2.0.1";
-       sha256 = "01ixrqas444vd0dynx6lkfgvjrd3fnj1lwdz7pcwaiclww5nyxba";
+       version = "0.2.0.2";
+       sha256 = "06mvkp9b0hxlp1w2yp7bb6340l88mzs15azx7nma401icqdhvbpn";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/DanBurton/ANum#readme";
@@ -3534,36 +3534,6 @@ self: {
      }:
      mkDerivation {
        pname = "DAV";
-       version = "1.3.1";
-       sha256 = "02f03grgwsazvlkyn743k6hjck9s7brbcgbzvyxv9gwbiyjzm02w";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring case-insensitive containers data-default exceptions
-         http-client http-client-tls http-types lens mtl transformers
-         transformers-base transformers-compat utf8-string xml-conduit
-         xml-hamlet
-       ];
-       executableHaskellDepends = [
-         base bytestring case-insensitive containers data-default exceptions
-         haskeline http-client http-client-tls http-types lens mtl network
-         network-uri optparse-applicative transformers transformers-base
-         transformers-compat utf8-string xml-conduit xml-hamlet
-       ];
-       homepage = "http://floss.scru.org/hDAV";
-       description = "RFC 4918 WebDAV support";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "DAV_1_3_2" = callPackage
-    ({ mkDerivation, base, bytestring, case-insensitive, containers
-     , data-default, exceptions, haskeline, http-client, http-client-tls
-     , http-types, lens, mtl, network, network-uri, optparse-applicative
-     , transformers, transformers-base, transformers-compat, utf8-string
-     , xml-conduit, xml-hamlet
-     }:
-     mkDerivation {
-       pname = "DAV";
        version = "1.3.2";
        sha256 = "0sai0b7bxwif5czmmdik5dx318drx18inid87wfrxckrflsi8cv1";
        isLibrary = true;
@@ -3583,7 +3553,6 @@ self: {
        homepage = "http://floss.scru.org/hDAV";
        description = "RFC 4918 WebDAV support";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DBlimited" = callPackage
@@ -10411,6 +10380,36 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "IPv6DB_0_2_5" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, fast-logger
+     , hedis, hspec, http-client, http-types, IPv6Addr, mtl
+     , optparse-applicative, text, unordered-containers, vector, wai
+     , wai-logger, warp
+     }:
+     mkDerivation {
+       pname = "IPv6DB";
+       version = "0.2.5";
+       sha256 = "0n8998fkdp6p1gr5j7kg0xfkh88cxmqiwxzh75q0xmkasphx4yfq";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring hedis http-types IPv6Addr mtl text
+         unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring fast-logger hedis http-types IPv6Addr mtl
+         optparse-applicative text unordered-containers vector wai
+         wai-logger warp
+       ];
+       testHaskellDepends = [
+         aeson base hspec http-client http-types vector
+       ];
+       homepage = "http://ipv6db.cybervisible.com";
+       description = "A RESTful Web Service for IPv6-related data";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "IcoGrid" = callPackage
     ({ mkDerivation, array, base, GlomeVec }:
      mkDerivation {
@@ -10808,23 +10807,6 @@ self: {
      }:
      mkDerivation {
        pname = "JuicyPixels";
-       version = "3.2.9.3";
-       sha256 = "14s57fgf6kd5n5al2kcvk1aaxbq1ph0r5h8blflrjkx83yl6r8yn";
-       libraryHaskellDepends = [
-         base binary bytestring containers deepseq mtl primitive
-         transformers vector zlib
-       ];
-       homepage = "https://github.com/Twinside/Juicy.Pixels";
-       description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "JuicyPixels_3_2_9_4" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl
-     , primitive, transformers, vector, zlib
-     }:
-     mkDerivation {
-       pname = "JuicyPixels";
        version = "3.2.9.4";
        sha256 = "1mlj3zcr3c49mjv0sddsfdzvzv3m0cbv56fbrkarygs5dxyh8dgz";
        libraryHaskellDepends = [
@@ -10834,7 +10816,6 @@ self: {
        homepage = "https://github.com/Twinside/Juicy.Pixels";
        description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "JuicyPixels-canvas" = callPackage
@@ -12299,21 +12280,6 @@ self: {
     ({ mkDerivation, base, newtype-generics }:
      mkDerivation {
        pname = "MemoTrie";
-       version = "0.6.8";
-       sha256 = "194x8a1x8ch5xwpxaagrmpsjca92x1zjiq6dlqdgckyr49blknaz";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base newtype-generics ];
-       executableHaskellDepends = [ base ];
-       homepage = "https://github.com/conal/MemoTrie";
-       description = "Trie-based memo functions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "MemoTrie_0_6_9" = callPackage
-    ({ mkDerivation, base, newtype-generics }:
-     mkDerivation {
-       pname = "MemoTrie";
        version = "0.6.9";
        sha256 = "157p0pi6rrq74a35mq6zkkycv4ah7xhkbrcmnkb9xf7pznw4aq0x";
        isLibrary = true;
@@ -12323,7 +12289,6 @@ self: {
        homepage = "https://github.com/conal/MemoTrie";
        description = "Trie-based memo functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MetaHDBC" = callPackage
@@ -21825,39 +21790,6 @@ self: {
      }:
      mkDerivation {
        pname = "aeson";
-       version = "1.2.3.0";
-       sha256 = "1gwwqpbj6j93nlm6rvhdmvs0sq8rn17cwpyw7wdphanwjn9cdkda";
-       libraryHaskellDepends = [
-         attoparsec base base-compat bytestring containers deepseq dlist
-         ghc-prim hashable scientific tagged template-haskell text
-         th-abstraction time time-locale-compat unordered-containers
-         uuid-types vector
-       ];
-       testHaskellDepends = [
-         attoparsec base base-compat base-orphans base16-bytestring
-         bytestring containers directory dlist filepath generic-deriving
-         ghc-prim hashable hashable-time HUnit integer-logarithms QuickCheck
-         quickcheck-instances scientific tagged template-haskell
-         test-framework test-framework-hunit test-framework-quickcheck2 text
-         time time-locale-compat unordered-containers uuid-types vector
-       ];
-       homepage = "https://github.com/bos/aeson";
-       description = "Fast JSON parsing and encoding";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "aeson_1_2_4_0" = callPackage
-    ({ mkDerivation, attoparsec, base, base-compat, base-orphans
-     , base16-bytestring, bytestring, containers, deepseq, directory
-     , dlist, filepath, generic-deriving, ghc-prim, hashable
-     , hashable-time, HUnit, integer-logarithms, QuickCheck
-     , quickcheck-instances, scientific, tagged, template-haskell
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , text, th-abstraction, time, time-locale-compat
-     , unordered-containers, uuid-types, vector
-     }:
-     mkDerivation {
-       pname = "aeson";
        version = "1.2.4.0";
        sha256 = "16zwpd07cmhs58wwsqbhxy3b58gqw8w5nr7nf6lwi4nvznjdn09l";
        libraryHaskellDepends = [
@@ -21877,7 +21809,6 @@ self: {
        homepage = "https://github.com/bos/aeson";
        description = "Fast JSON parsing and encoding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-applicative" = callPackage
@@ -22338,8 +22269,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-quick";
-       version = "0.1.1.2";
-       sha256 = "0b1pp0hl543pmjkhmcq112xxivd8njnfpgklayllyrxdrbrafrp6";
+       version = "0.1.2.0";
+       sha256 = "18a5gwfyx382dxlhr4gch8yd39kgiamp2fpxsvvgi7bfyc55pq1h";
        libraryHaskellDepends = [
          aeson attoparsec base deepseq text unordered-containers vector
        ];
@@ -25031,6 +24962,27 @@ self: {
        license = stdenv.lib.licenses.mpl20;
      }) {};
 
+  "amazonka-iam-policy" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
+     , bytestring, doctest, hspec, profunctors, scientific, text, time
+     }:
+     mkDerivation {
+       pname = "amazonka-iam-policy";
+       version = "0.0.1";
+       sha256 = "1mjc5ym604n9bi9fl7b0581i5z7vy12ri99lz3imz1k3dhr6xwga";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base base64-bytestring bytestring profunctors scientific text
+         time
+       ];
+       testHaskellDepends = [
+         aeson aeson-pretty base bytestring doctest hspec
+       ];
+       homepage = "https://github.com/brendanhay/amazonka-iam-policy";
+       description = "Amazon IAM Policy Document DSL and Combinators";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-importexport" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -29207,6 +29159,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "async-timer_0_1_4_1" = callPackage
+    ({ mkDerivation, base, containers, criterion, HUnit, lifted-async
+     , lifted-base, monad-control, safe-exceptions, test-framework
+     , test-framework-hunit, transformers-base
+     }:
+     mkDerivation {
+       pname = "async-timer";
+       version = "0.1.4.1";
+       sha256 = "1653hcx4a265drbgp0js9bhg3zfaspqxkx12f4v22vrfg64lvan2";
+       libraryHaskellDepends = [
+         base lifted-async lifted-base monad-control safe-exceptions
+         transformers-base
+       ];
+       testHaskellDepends = [
+         base containers criterion HUnit lifted-async test-framework
+         test-framework-hunit
+       ];
+       homepage = "https://github.com/mtesseract/async-timer#readme";
+       description = "Provides API for timer based execution of IO actions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "asynchronous-exceptions" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -29460,10 +29435,10 @@ self: {
     ({ mkDerivation, base, stm }:
      mkDerivation {
        pname = "atomic-modify";
-       version = "0.1.0.0";
-       sha256 = "138nm3mgrr8yk4dlk4zlrxzrqp250wxl0sj3qbb3n1vyx5mhw02y";
+       version = "0.1.0.1";
+       sha256 = "0kkfbm7jkarzj42ja7093i1j1h4klg362pfz1cvldvdhzjgs009r";
        libraryHaskellDepends = [ base stm ];
-       homepage = "https://github.com/chris-martin/haskell-libraries";
+       homepage = "https://github.com/chris-martin/atomic-modify";
        description = "A typeclass for mutable references that have an atomic modify operation";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29615,21 +29590,23 @@ self: {
 
   "ats-pkg" = callPackage
     ({ mkDerivation, ansi-wl-pprint, ats-setup, base, binary
-     , bytestring, Cabal, cli-setup, composition-prelude, dependency
-     , dhall, directory, http-client, http-client-tls, lens
-     , optparse-applicative, parallel-io, process, shake, shake-ats
-     , shake-ext, tar, temporary, text, unix, zip-archive, zlib
+     , bytestring, bzlib, Cabal, cli-setup, composition-prelude
+     , containers, dependency, dhall, directory, file-embed, http-client
+     , http-client-tls, lens, lzma, optparse-applicative, parallel-io
+     , process, shake, shake-ats, shake-ext, tar, temporary, text, unix
+     , zip-archive, zlib
      }:
      mkDerivation {
        pname = "ats-pkg";
-       version = "2.2.1.1";
-       sha256 = "1gbin3wsnhk34pqr7qi0dld91n7m600bbn5pnbhg0z59d43wl5iq";
+       version = "2.4.0.0";
+       sha256 = "1dhspgnyds4r08jqnabaal12xv6vvrk7mkgwhiwl4z0mb6zi0kry";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cli-setup ];
        libraryHaskellDepends = [
-         ansi-wl-pprint ats-setup base binary bytestring composition-prelude
-         dependency dhall directory http-client http-client-tls lens
+         ansi-wl-pprint ats-setup base binary bytestring bzlib
+         composition-prelude containers dependency dhall directory
+         file-embed http-client http-client-tls lens lzma
          optparse-applicative parallel-io process shake shake-ats shake-ext
          tar temporary text unix zip-archive zlib
        ];
@@ -29661,8 +29638,8 @@ self: {
     ({ mkDerivation, base, bytestring, composition-prelude, text }:
      mkDerivation {
        pname = "ats-storable";
-       version = "0.2.0.1";
-       sha256 = "0cybcdsq8gj2wzhfa5jbw5ihlbhrsgx9dyyi157yxj7dbbhz3abs";
+       version = "0.2.1.0";
+       sha256 = "1d374jkiifyn6hqr584waqhk4kirqibycs0fszf1v21dkk14jyvx";
        libraryHaskellDepends = [
          base bytestring composition-prelude text
        ];
@@ -30774,6 +30751,44 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "aws_0_19" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
+     , base64-bytestring, blaze-builder, byteable, bytestring
+     , case-insensitive, cereal, conduit, conduit-combinators
+     , conduit-extra, containers, cryptonite, data-default, directory
+     , errors, filepath, http-client, http-client-tls, http-conduit
+     , http-types, lifted-base, memory, monad-control, mtl, network
+     , old-locale, QuickCheck, quickcheck-instances, resourcet, safe
+     , scientific, tagged, tasty, tasty-hunit, tasty-quickcheck, text
+     , time, transformers, transformers-base, unordered-containers
+     , utf8-string, vector, xml-conduit
+     }:
+     mkDerivation {
+       pname = "aws";
+       version = "0.19";
+       sha256 = "0ykpnm2kyhjf1rf5ldhv0c7zy3zq7jgqmb6xwywk8b2s80ai4fxl";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson attoparsec base base16-bytestring base64-bytestring
+         blaze-builder byteable bytestring case-insensitive cereal conduit
+         conduit-extra containers cryptonite data-default directory filepath
+         http-conduit http-types lifted-base memory monad-control mtl
+         network old-locale resourcet safe scientific tagged text time
+         transformers unordered-containers utf8-string vector xml-conduit
+       ];
+       testHaskellDepends = [
+         aeson base bytestring conduit-combinators errors http-client
+         http-client-tls http-types lifted-base monad-control mtl QuickCheck
+         quickcheck-instances resourcet tagged tasty tasty-hunit
+         tasty-quickcheck text time transformers transformers-base
+       ];
+       homepage = "http://github.com/aristidb/aws";
+       description = "Amazon Web Services (AWS) for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "aws-cloudfront-signer" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-types, base, base64-bytestring
      , bytestring, crypto-pubkey-types, RSA, time
@@ -32245,6 +32260,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "base64-bytestring-type" = callPackage
+    ({ mkDerivation, aeson, base, base-compat, base64-bytestring
+     , binary, bytestring, cereal, deepseq, hashable, QuickCheck, tasty
+     , tasty-quickcheck, text
+     }:
+     mkDerivation {
+       pname = "base64-bytestring-type";
+       version = "1";
+       sha256 = "0h74c0qhf4n0pamrl29ha5hgf940bay0dhl8rifaw4l03z8rn0bl";
+       libraryHaskellDepends = [
+         aeson base base-compat base64-bytestring binary bytestring cereal
+         deepseq hashable QuickCheck text
+       ];
+       testHaskellDepends = [
+         aeson base binary bytestring cereal tasty tasty-quickcheck
+       ];
+       homepage = "https://github.com/futurice/haskell-base64-bytestring-type#readme";
+       description = "A newtype around ByteString, for base64 encoding";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "base64-conduit" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, conduit
      , hspec, QuickCheck, transformers
@@ -33389,28 +33425,6 @@ self: {
 
   "bifunctors" = callPackage
     ({ mkDerivation, base, base-orphans, comonad, containers, hspec
-     , QuickCheck, semigroups, tagged, template-haskell, th-abstraction
-     , transformers, transformers-compat
-     }:
-     mkDerivation {
-       pname = "bifunctors";
-       version = "5.5";
-       sha256 = "0a5y85p1dhcvkagpdci6ah5kczc2jpwsj7ywkd9cg0nqcyzq3icj";
-       libraryHaskellDepends = [
-         base base-orphans comonad containers semigroups tagged
-         template-haskell th-abstraction transformers transformers-compat
-       ];
-       testHaskellDepends = [
-         base hspec QuickCheck template-haskell transformers
-         transformers-compat
-       ];
-       homepage = "http://github.com/ekmett/bifunctors/";
-       description = "Bifunctors";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "bifunctors_5_5_2" = callPackage
-    ({ mkDerivation, base, base-orphans, comonad, containers, hspec
      , hspec-discover, QuickCheck, semigroups, tagged, template-haskell
      , th-abstraction, transformers, transformers-compat
      }:
@@ -33430,7 +33444,6 @@ self: {
        homepage = "http://github.com/ekmett/bifunctors/";
        description = "Bifunctors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bighugethesaurus" = callPackage
@@ -36858,35 +36871,6 @@ self: {
      }:
      mkDerivation {
        pname = "bloodhound";
-       version = "0.15.0.1";
-       sha256 = "0g85fp2vppx6p1zbx506jnsfcik8q7nmc98fwrhcckgvkbdpi2v8";
-       libraryHaskellDepends = [
-         aeson base blaze-builder bytestring containers data-default-class
-         exceptions hashable http-client http-types mtl mtl-compat
-         network-uri scientific semigroups text time transformers
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers errors exceptions generics-sop
-         hspec http-client http-types mtl network-uri QuickCheck
-         quickcheck-properties semigroups temporary text time unix-compat
-         unordered-containers vector
-       ];
-       homepage = "https://github.com/bitemyapp/bloodhound";
-       description = "ElasticSearch client library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "bloodhound_0_15_0_2" = callPackage
-    ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers
-     , data-default-class, errors, exceptions, generics-sop, hashable
-     , hspec, http-client, http-types, mtl, mtl-compat, network-uri
-     , QuickCheck, quickcheck-properties, scientific, semigroups
-     , temporary, text, time, transformers, unix-compat
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "bloodhound";
        version = "0.15.0.2";
        sha256 = "17xw085k72dmw1q4cbqjs07gvvwwfsijcs9lsb3smxxhri1s229i";
        libraryHaskellDepends = [
@@ -36904,7 +36888,6 @@ self: {
        homepage = "https://github.com/bitemyapp/bloodhound";
        description = "ElasticSearch client library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bloodhound-amazonka-auth" = callPackage
@@ -38106,16 +38089,23 @@ self: {
      }) {};
 
   "bricks" = callPackage
-    ({ mkDerivation, base, containers, doctest, hedgehog, parsec
-     , template-haskell, text
+    ({ mkDerivation, base, bricks-internal, bricks-internal-test
+     , bricks-parsec, bricks-rendering, bricks-syntax, containers
+     , doctest, hedgehog, mtl, parsec, template-haskell, text
+     , transformers
      }:
      mkDerivation {
        pname = "bricks";
-       version = "0.0.0.2";
-       sha256 = "1iyf9dkifl064x74vxnqdlv096qxiyhvqn91jmj090i4r6m4jlhw";
-       libraryHaskellDepends = [ base containers parsec text ];
+       version = "0.0.0.4";
+       sha256 = "018cp48bm3hk20kfq544hm50s6bik37lv1hnsdpkg6ibgz6a9i4v";
+       libraryHaskellDepends = [
+         base bricks-internal bricks-parsec bricks-rendering bricks-syntax
+         containers mtl parsec text transformers
+       ];
        testHaskellDepends = [
-         base containers doctest hedgehog parsec template-haskell text
+         base bricks-internal bricks-internal-test bricks-parsec
+         bricks-rendering bricks-syntax containers doctest hedgehog mtl
+         parsec template-haskell text transformers
        ];
        homepage = "https://github.com/chris-martin/bricks#readme";
        description = "Bricks is a lazy functional language based on Nix";
@@ -38123,6 +38113,104 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "bricks-internal" = callPackage
+    ({ mkDerivation, base, containers, doctest, either-list-functions
+     , text
+     }:
+     mkDerivation {
+       pname = "bricks-internal";
+       version = "0.0.0.4";
+       sha256 = "1c4nav1ak6nz06ps6pwsrd6ci8ly3xqi6yd8clsvrhqi1r4cwz80";
+       libraryHaskellDepends = [
+         base containers either-list-functions text
+       ];
+       testHaskellDepends = [
+         base containers doctest either-list-functions text
+       ];
+       homepage = "https://github.com/chris-martin/bricks#readme";
+       description = "...";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
+  "bricks-internal-test" = callPackage
+    ({ mkDerivation, base, bricks-internal, containers, hedgehog
+     , template-haskell, text
+     }:
+     mkDerivation {
+       pname = "bricks-internal-test";
+       version = "0.0.0.4";
+       sha256 = "1kvhvwi7qd1rxqn6zxz0vmzqnq2w5fzm1dld5yy08v6jr3f7ri8a";
+       libraryHaskellDepends = [
+         base bricks-internal containers hedgehog template-haskell text
+       ];
+       homepage = "https://github.com/chris-martin/bricks#readme";
+       description = "...";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
+  "bricks-parsec" = callPackage
+    ({ mkDerivation, base, bricks-internal, bricks-internal-test
+     , bricks-rendering, bricks-syntax, containers, doctest, hedgehog
+     , parsec, text
+     }:
+     mkDerivation {
+       pname = "bricks-parsec";
+       version = "0.0.0.4";
+       sha256 = "1rgcrdn4h4pmq9sa7fbzlmv93j6g80mhirnrx6f5iqgmshlg4cq0";
+       libraryHaskellDepends = [
+         base bricks-internal bricks-syntax containers parsec text
+       ];
+       testHaskellDepends = [
+         base bricks-internal bricks-internal-test bricks-rendering
+         bricks-syntax containers doctest hedgehog parsec text
+       ];
+       homepage = "https://github.com/chris-martin/bricks#readme";
+       description = "...";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
+  "bricks-rendering" = callPackage
+    ({ mkDerivation, base, bricks-internal, bricks-internal-test
+     , bricks-syntax, containers, doctest, hedgehog, template-haskell
+     , text
+     }:
+     mkDerivation {
+       pname = "bricks-rendering";
+       version = "0.0.0.4";
+       sha256 = "1ixg8qsima8hp547ms3jid4hcr0l605ha353r0bngwjxc5h3ixj4";
+       libraryHaskellDepends = [
+         base bricks-internal bricks-syntax containers text
+       ];
+       testHaskellDepends = [
+         base bricks-internal bricks-internal-test bricks-syntax containers
+         doctest hedgehog template-haskell text
+       ];
+       homepage = "https://github.com/chris-martin/bricks#readme";
+       description = "...";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
+  "bricks-syntax" = callPackage
+    ({ mkDerivation, base, bricks-internal, containers, doctest
+     , either-list-functions, exceptions, hint, text
+     }:
+     mkDerivation {
+       pname = "bricks-syntax";
+       version = "0.0.0.4";
+       sha256 = "0bg4vx32fh9fn5lvccayr9dfzynpql08x6ffi0xrw1rkpn2hz415";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base bricks-internal containers either-list-functions text
+       ];
+       testHaskellDepends = [
+         base bricks-internal containers doctest either-list-functions
+         exceptions hint text
+       ];
+       homepage = "https://github.com/chris-martin/bricks#readme";
+       description = "...";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "brillig" = callPackage
     ({ mkDerivation, base, binary, cmdargs, containers, directory
      , filepath, ListZipper, text
@@ -38897,6 +38985,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "butcher_1_3_0_0" = callPackage
+    ({ mkDerivation, base, bifunctors, containers, deque, extra, free
+     , microlens, microlens-th, mtl, multistate, pretty, transformers
+     , unsafe, void
+     }:
+     mkDerivation {
+       pname = "butcher";
+       version = "1.3.0.0";
+       sha256 = "0v85ganhfljxyqy9sfmhbqnfdazikmy8a3mpg1w1y827l4a3nkng";
+       libraryHaskellDepends = [
+         base bifunctors containers deque extra free microlens microlens-th
+         mtl multistate pretty transformers unsafe void
+       ];
+       testHaskellDepends = [
+         base containers deque extra free microlens microlens-th mtl
+         multistate pretty transformers unsafe
+       ];
+       homepage = "https://github.com/lspitzner/butcher/";
+       description = "Chops a command or program invocation into digestable pieces";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "butterflies" = callPackage
     ({ mkDerivation, base, bytestring, gl-capture, GLUT, OpenGLRaw
      , OpenGLRaw21, repa, repa-devil
@@ -39168,6 +39279,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "bytestring-encodings" = callPackage
+    ({ mkDerivation, base, bytestring, gauge, ghc-prim, hedgehog, text
+     }:
+     mkDerivation {
+       pname = "bytestring-encodings";
+       version = "0.1.0.0";
+       sha256 = "070n1203shbfkimkrxr5xs5znpljbb61v7npwp9lgfpj4h8gyaq7";
+       libraryHaskellDepends = [ base bytestring ghc-prim ];
+       testHaskellDepends = [ base bytestring hedgehog ];
+       benchmarkHaskellDepends = [ base bytestring gauge text ];
+       description = "checks to see if a given bytestring adheres to a certain encoding";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "bytestring-from" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, QuickCheck, tasty
      , tasty-quickcheck, text
@@ -39585,8 +39710,8 @@ self: {
      }:
      mkDerivation {
        pname = "c-mosquitto";
-       version = "0.1.2.0";
-       sha256 = "1q2g7wv11d8p5ykbh0m7xd8jx4lvm73i503rz5pvsgmgm39fwy98";
+       version = "0.1.3.0";
+       sha256 = "0l7vyiynn7wzsf4yvm2f6wn9qmhvi3aj46vwxvgwk33bskhwkr64";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -39971,25 +40096,12 @@ self: {
     ({ mkDerivation, base, Cabal, directory, filepath }:
      mkDerivation {
        pname = "cabal-doctest";
-       version = "1.0.5";
-       sha256 = "0x3m97q3xjmvf601vzkx4a8sl77x1y8jf0lwbq67181s37jp9asm";
-       libraryHaskellDepends = [ base Cabal directory filepath ];
-       homepage = "https://github.com/phadej/cabal-doctest";
-       description = "A Setup.hs helper for doctests running";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "cabal-doctest_1_0_6" = callPackage
-    ({ mkDerivation, base, Cabal, directory, filepath }:
-     mkDerivation {
-       pname = "cabal-doctest";
        version = "1.0.6";
        sha256 = "0bgd4jdmzxq5y465r4sf4jv2ix73yvblnr4c9wyazazafddamjny";
        libraryHaskellDepends = [ base Cabal directory filepath ];
        homepage = "https://github.com/phadej/cabal-doctest";
        description = "A Setup.hs helper for doctests running";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-file-th" = callPackage
@@ -40549,22 +40661,6 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-toolkit";
-       version = "0.0.4";
-       sha256 = "04afwsbbqsw9lj7flbnrfwy3qbv1c9nkwm65ylspy2nzf9v06ljj";
-       libraryHaskellDepends = [
-         base binary bytestring Cabal containers ghc template-haskell
-       ];
-       homepage = "https://github.com/TerrorJack/cabal-toolkit#readme";
-       description = "Helper functions for writing custom Setup.hs scripts.";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "cabal-toolkit_0_0_5" = callPackage
-    ({ mkDerivation, base, binary, bytestring, Cabal, containers, ghc
-     , template-haskell
-     }:
-     mkDerivation {
-       pname = "cabal-toolkit";
        version = "0.0.5";
        sha256 = "1w3c75avp12ig1bmakgjsp10rb8bnnibxi1sbg96y6gx4g3krbcq";
        libraryHaskellDepends = [
@@ -40573,7 +40669,6 @@ self: {
        homepage = "https://github.com/TerrorJack/cabal-toolkit#readme";
        description = "Helper functions for writing custom Setup.hs scripts.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-uninstall" = callPackage
@@ -42654,6 +42749,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cayley-client_0_4_3" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
+     , exceptions, hspec, http-client, http-conduit, lens, lens-aeson
+     , mtl, text, transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "cayley-client";
+       version = "0.4.3";
+       sha256 = "119jihcnrv197a8v6xciav7dlkq6lagwhp3bw2aviyz49bhsq1j6";
+       libraryHaskellDepends = [
+         aeson attoparsec base binary bytestring exceptions http-client
+         http-conduit lens lens-aeson mtl text transformers
+         unordered-containers vector
+       ];
+       testHaskellDepends = [ aeson base hspec unordered-containers ];
+       homepage = "https://github.com/MichelBoucey/cayley-client";
+       description = "A Haskell client for the Cayley graph database";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cayley-dickson" = callPackage
     ({ mkDerivation, base, random }:
      mkDerivation {
@@ -48062,28 +48178,6 @@ self: {
      }:
      mkDerivation {
        pname = "comonad";
-       version = "5.0.2";
-       sha256 = "115pai560rllsmym76bj787kwz5xx19y8bl6262005nddqwzxc0v";
-       revision = "2";
-       editedCabalFile = "1ngks9bym68rw0xdq43n14nay4kxdxv2n7alwfd9wcpismfz009g";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         base containers contravariant distributive semigroups tagged
-         transformers transformers-compat
-       ];
-       testHaskellDepends = [ base doctest ];
-       homepage = "http://github.com/ekmett/comonad/";
-       description = "Comonads";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "comonad_5_0_3" = callPackage
-    ({ mkDerivation, base, Cabal, cabal-doctest, containers
-     , contravariant, distributive, doctest, semigroups, tagged
-     , transformers, transformers-compat
-     }:
-     mkDerivation {
-       pname = "comonad";
        version = "5.0.3";
        sha256 = "1xjdwm0xvkcqrpyivl6v569dj8xgivw103bzahy14la0cd6mix57";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -48095,7 +48189,6 @@ self: {
        homepage = "http://github.com/ekmett/comonad/";
        description = "Comonads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "comonad-extras" = callPackage
@@ -48890,24 +48983,6 @@ self: {
      }:
      mkDerivation {
        pname = "concise";
-       version = "0.1.0.0";
-       sha256 = "0ga10djxmc5n37cf5iazkwivfxipav0q2gb8mbkbg3wnn1qhqxmm";
-       libraryHaskellDepends = [ base bytestring lens text ];
-       testHaskellDepends = [
-         base bytestring lens QuickCheck quickcheck-instances tasty
-         tasty-quickcheck text
-       ];
-       homepage = "https://github.com/frasertweedal/hs-concise";
-       description = "Utilities for Control.Lens.Cons";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "concise_0_1_0_1" = callPackage
-    ({ mkDerivation, base, bytestring, lens, QuickCheck
-     , quickcheck-instances, tasty, tasty-quickcheck, text
-     }:
-     mkDerivation {
-       pname = "concise";
        version = "0.1.0.1";
        sha256 = "09crgc6gjfidlad6263253xx1di6wfhc9awhira21s0z7rddy9sw";
        libraryHaskellDepends = [ base bytestring lens text ];
@@ -48918,7 +48993,6 @@ self: {
        homepage = "https://github.com/frasertweedale/hs-concise";
        description = "Utilities for Control.Lens.Cons";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "concorde" = callPackage
@@ -49244,22 +49318,6 @@ self: {
      }:
      mkDerivation {
        pname = "concurrent-output";
-       version = "1.10.2";
-       sha256 = "02kfg61f7lm8796n4pdi7yvscg8n869vhl9i6rd9rpyb4l9myzd1";
-       libraryHaskellDepends = [
-         ansi-terminal async base directory exceptions process stm
-         terminal-size text transformers unix
-       ];
-       description = "Ungarble output from several threads or commands";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "concurrent-output_1_10_3" = callPackage
-    ({ mkDerivation, ansi-terminal, async, base, directory, exceptions
-     , process, stm, terminal-size, text, transformers, unix
-     }:
-     mkDerivation {
-       pname = "concurrent-output";
        version = "1.10.3";
        sha256 = "0sp5mc7pxw48k0hv17l553bcjr7s5dp9vznm2n6400nyhgmxdha8";
        libraryHaskellDepends = [
@@ -49268,7 +49326,6 @@ self: {
        ];
        description = "Ungarble output from several threads or commands";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "concurrent-rpc" = callPackage
@@ -49674,27 +49731,6 @@ self: {
      }:
      mkDerivation {
        pname = "conduit-connection";
-       version = "0.1.0.3";
-       sha256 = "16j3h318i7s3nr9cz6n1v27d7nkmz5s6dp4fbahziy1pgb4bk3kr";
-       libraryHaskellDepends = [
-         base bytestring conduit connection resourcet transformers
-       ];
-       testHaskellDepends = [
-         base bytestring conduit connection HUnit network resourcet
-         test-framework test-framework-hunit transformers
-       ];
-       homepage = "https://github.com/sdroege/conduit-connection";
-       description = "Conduit source and sink for Network.Connection.";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "conduit-connection_0_1_0_4" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, connection, HUnit
-     , network, resourcet, test-framework, test-framework-hunit
-     , transformers
-     }:
-     mkDerivation {
-       pname = "conduit-connection";
        version = "0.1.0.4";
        sha256 = "1z11r3rf6hmz5b00w4xymp6x0s00acyvbyw6n99wd3b9ycbl2y2y";
        libraryHaskellDepends = [
@@ -49707,7 +49743,6 @@ self: {
        homepage = "https://github.com/sdroege/conduit-connection";
        description = "Conduit source and sink for Network.Connection.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "conduit-extra" = callPackage
@@ -49813,27 +49848,6 @@ self: {
      }:
      mkDerivation {
        pname = "conduit-iconv";
-       version = "0.1.1.2";
-       sha256 = "02s5jyr6mii45q4nar5fzqr4hsf7b6rw9fyc6g1jrqjr76xk6vsw";
-       libraryHaskellDepends = [ base bytestring conduit ];
-       testHaskellDepends = [
-         base bytestring conduit mtl QuickCheck test-framework
-         test-framework-quickcheck2 text
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring conduit criterion mtl text
-       ];
-       homepage = "https://github.com/sdroege/conduit-iconv";
-       description = "Conduit for character encoding conversion";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "conduit-iconv_0_1_1_3" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, criterion, mtl
-     , QuickCheck, test-framework, test-framework-quickcheck2, text
-     }:
-     mkDerivation {
-       pname = "conduit-iconv";
        version = "0.1.1.3";
        sha256 = "1dmcsdx0nz0b9sans2fr8lmrii2n0fsjh41jhwlrlng4h93k0w8w";
        libraryHaskellDepends = [ base bytestring conduit ];
@@ -49847,7 +49861,6 @@ self: {
        homepage = "https://github.com/sdroege/conduit-iconv";
        description = "Conduit for character encoding conversion";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "conduit-merge" = callPackage
@@ -52655,17 +52668,18 @@ self: {
      }) {};
 
   "crdt" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, Diff, mtl
-     , network-info, QuickCheck, QuickCheck-GenT, quickcheck-instances
-     , safe, stm, tasty, tasty-discover, tasty-quickcheck, time, vector
+    ({ mkDerivation, base, binary, bytestring, containers, Diff
+     , hashable, mtl, network-info, QuickCheck, QuickCheck-GenT
+     , quickcheck-instances, safe, stm, tasty, tasty-discover
+     , tasty-quickcheck, time, vector
      }:
      mkDerivation {
        pname = "crdt";
-       version = "7.0";
-       sha256 = "17wpc1qn2kid2rw7icx1apaca6znzx1gy0h8j9qap3f2p852z1zk";
+       version = "9.0";
+       sha256 = "099rpmwwla68vyw366xmzpdyv39hxcpidpkg1l0lx2mjz2jxm6zc";
        libraryHaskellDepends = [
-         base binary bytestring containers Diff mtl network-info safe stm
-         time vector
+         base binary bytestring containers Diff hashable mtl network-info
+         safe stm time vector
        ];
        testHaskellDepends = [
          base containers mtl QuickCheck QuickCheck-GenT quickcheck-instances
@@ -54122,19 +54136,6 @@ self: {
     ({ mkDerivation, attoparsec, base, hspec, QuickCheck, text }:
      mkDerivation {
        pname = "css-text";
-       version = "0.1.2.2";
-       sha256 = "11qrwrjqk2k4bm3bz1qcyscp146raz1hgpzynkd50yaq12n69xfz";
-       libraryHaskellDepends = [ attoparsec base text ];
-       testHaskellDepends = [ attoparsec base hspec QuickCheck text ];
-       homepage = "http://www.yesodweb.com/";
-       description = "CSS parser and renderer";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "css-text_0_1_3_0" = callPackage
-    ({ mkDerivation, attoparsec, base, hspec, QuickCheck, text }:
-     mkDerivation {
-       pname = "css-text";
        version = "0.1.3.0";
        sha256 = "0ynd9f4hn2sfwqzbsa0y7phmxq8za7jiblpjwx0ry8b372zhgxaz";
        libraryHaskellDepends = [ attoparsec base text ];
@@ -54142,7 +54143,6 @@ self: {
        homepage = "https://github.com/yesodweb/css-text.git#readme";
        description = "CSS parser and renderer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "csv" = callPackage
@@ -56354,8 +56354,8 @@ self: {
     ({ mkDerivation, base, doctest }:
      mkDerivation {
        pname = "data-forest";
-       version = "0.1.0.5";
-       sha256 = "05hpi0xr4bp7jigb6qa48n02widxxcn9npjh1y876mkgsdpd4x01";
+       version = "0.1.0.6";
+       sha256 = "11iisc82cgma5pp6apnjg112dd4cvqxclwf09zh9rh50lzkml9dk";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
        homepage = "https://github.com/chris-martin/data-forest";
@@ -59092,19 +59092,20 @@ self: {
      }) {};
 
   "dependency" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, binary, containers
-     , criterion, deepseq, hspec, microlens, recursion-schemes
+    ({ mkDerivation, ansi-wl-pprint, base, binary, composition-prelude
+     , containers, criterion, deepseq, hspec, microlens
+     , recursion-schemes
      }:
      mkDerivation {
        pname = "dependency";
-       version = "0.1.0.1";
-       sha256 = "0kl8dsflw1g8a5k0x6v0fjc94gxdz6cxn4kj5jydbv63b044m71a";
+       version = "0.1.0.5";
+       sha256 = "0b1v2vx4yyn90195f02i6dj4phzrb0a1wfb9mj1kq568pl02w3q3";
        libraryHaskellDepends = [
-         ansi-wl-pprint base binary containers deepseq microlens
-         recursion-schemes
+         ansi-wl-pprint base binary composition-prelude containers deepseq
+         microlens recursion-schemes
        ];
-       testHaskellDepends = [ base hspec ];
-       benchmarkHaskellDepends = [ base criterion ];
+       testHaskellDepends = [ base containers hspec ];
+       benchmarkHaskellDepends = [ base containers criterion ];
        description = "Dependency resolution for package management";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -59913,19 +59914,6 @@ self: {
     ({ mkDerivation, base, dhall, optparse-generic, text }:
      mkDerivation {
        pname = "dhall-text";
-       version = "1.0.4";
-       sha256 = "1ba2sljiq016jhgx7ifh5vjrwxd1czv2gm56h2pig3p0x45ds2wm";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [ base dhall optparse-generic text ];
-       description = "Template text using Dhall";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "dhall-text_1_0_5" = callPackage
-    ({ mkDerivation, base, dhall, optparse-generic, text }:
-     mkDerivation {
-       pname = "dhall-text";
        version = "1.0.5";
        sha256 = "195nfflpk787m8jjmspw2x4rb2s7vd0z5wz5s0bzfwdl6c7xgg27";
        isLibrary = false;
@@ -59933,7 +59921,6 @@ self: {
        executableHaskellDepends = [ base dhall optparse-generic text ];
        description = "Template text using Dhall";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dhcp-lease-parser" = callPackage
@@ -61935,8 +61922,8 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-closure";
-       version = "0.3.4.0";
-       sha256 = "1c7jf2czaaf24l22aw1j4yj9nksycvsvj708vzj9lb50zhdbpdgg";
+       version = "0.3.5";
+       sha256 = "0mm3w8l63n9lbifrj32kv5xbb79fiwd4swi2kv2lbnc67b6ig43h";
        libraryHaskellDepends = [
          base binary bytestring constraints syb template-haskell
        ];
@@ -63242,6 +63229,37 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "doctest_0_14_0" = callPackage
+    ({ mkDerivation, base, base-compat, code-page, deepseq, directory
+     , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process
+     , QuickCheck, setenv, silently, stringbuilder, syb, transformers
+     , with-location
+     }:
+     mkDerivation {
+       pname = "doctest";
+       version = "0.14.0";
+       sha256 = "18qia153653fib1jdrdyvxa3wjcfhdn371r97mwv03q915i4bm3g";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base-compat code-page deepseq directory filepath ghc ghc-paths
+         process syb transformers
+       ];
+       executableHaskellDepends = [
+         base base-compat code-page deepseq directory filepath ghc ghc-paths
+         process syb transformers
+       ];
+       testHaskellDepends = [
+         base base-compat code-page deepseq directory filepath ghc ghc-paths
+         hspec HUnit mockery process QuickCheck setenv silently
+         stringbuilder syb transformers with-location
+       ];
+       homepage = "https://github.com/sol/doctest#readme";
+       description = "Test interactive Haskell examples";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "doctest-discover" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, doctest
      , filepath
@@ -66065,8 +66083,8 @@ self: {
     ({ mkDerivation, base, doctest }:
      mkDerivation {
        pname = "either-list-functions";
-       version = "0.0.0.1";
-       sha256 = "1k5zpyii5wkzr1xzfbkl015sj91pghl93ifjs6shgyysyh6b62z5";
+       version = "0.0.0.2";
+       sha256 = "0m7fkf8r1i0z3zrfmnqsdzk0fc9mhanqmx7x6rjiisjiaf91yr8d";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
        homepage = "https://github.com/chris-martin/either-list-functions#readme";
@@ -69520,18 +69538,6 @@ self: {
      }) {};
 
   "exact-pi" = callPackage
-    ({ mkDerivation, base, numtype-dk }:
-     mkDerivation {
-       pname = "exact-pi";
-       version = "0.4.1.2";
-       sha256 = "1qs5zi9c87sypnxdwncdj7dnrylly7s2yvjhm7rx4fxsbxrfdfxj";
-       libraryHaskellDepends = [ base numtype-dk ];
-       homepage = "https://github.com/dmcclean/exact-pi/";
-       description = "Exact rational multiples of pi (and integer powers of pi)";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "exact-pi_0_4_1_3" = callPackage
     ({ mkDerivation, base, numtype-dk, semigroups }:
      mkDerivation {
        pname = "exact-pi";
@@ -69541,7 +69547,6 @@ self: {
        homepage = "https://github.com/dmcclean/exact-pi/";
        description = "Exact rational multiples of pi (and integer powers of pi)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "exact-real" = callPackage
@@ -70266,19 +70271,17 @@ self: {
      }) {};
 
   "expressions" = callPackage
-    ({ mkDerivation, attoparsec, base, containers, lattices, QuickCheck
-     , singletons, tasty, tasty-quickcheck, text, transformers
+    ({ mkDerivation, attoparsec, base, containers, lattices, singletons
+     , text, transformers
      }:
      mkDerivation {
        pname = "expressions";
-       version = "0.1.4";
-       sha256 = "1dxkg5yc2njq7dpv7vgkmrs73x5np5w1ahi79my6ysamnc2w8a04";
+       version = "0.1.5";
+       sha256 = "1iw6i922wjvs844gqqvmvhvfaq8c06lxlca806s6rbk0sxq40nmz";
        libraryHaskellDepends = [
          attoparsec base containers lattices singletons text transformers
        ];
-       testHaskellDepends = [
-         base QuickCheck singletons tasty tasty-quickcheck text
-       ];
+       testHaskellDepends = [ base singletons text ];
        description = "Expressions and Formulae a la carte";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -70289,8 +70292,8 @@ self: {
      }:
      mkDerivation {
        pname = "expressions-z3";
-       version = "0.1.1";
-       sha256 = "0hk8qhkvlh4v210k7d845krg31px72ma44fmwahbycn6pgy32659";
+       version = "0.1.2";
+       sha256 = "0q3fnljdsqh1937a8s9a62cmcg1nc787725jp0j32jlmbwwhkfyv";
        libraryHaskellDepends = [
          base containers expressions singletons transformers z3
        ];
@@ -71000,24 +71003,6 @@ self: {
      }:
      mkDerivation {
        pname = "fast-logger";
-       version = "2.4.10";
-       sha256 = "13b7rrv8dw574k6lbl96nar67fx81058gvilsc42v0lgm38sbi6y";
-       libraryHaskellDepends = [
-         array auto-update base bytestring directory easy-file filepath text
-         unix unix-time
-       ];
-       testHaskellDepends = [ base bytestring directory hspec ];
-       homepage = "https://github.com/kazu-yamamoto/logger";
-       description = "A fast logging system";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "fast-logger_2_4_11" = callPackage
-    ({ mkDerivation, array, auto-update, base, bytestring, directory
-     , easy-file, filepath, hspec, text, unix, unix-time
-     }:
-     mkDerivation {
-       pname = "fast-logger";
        version = "2.4.11";
        sha256 = "1ad2vq4nifdxshqk9yrmghqizhkgybfz134kpr6padglb2mxxrdv";
        libraryHaskellDepends = [
@@ -71028,7 +71013,6 @@ self: {
        homepage = "https://github.com/kazu-yamamoto/logger";
        description = "A fast logging system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fast-math" = callPackage
@@ -73035,6 +73019,8 @@ self: {
        pname = "finite-field";
        version = "0.9.0";
        sha256 = "026l5qrc7vsm2s19z10xx30lrsfkwwcymyznyy5hrcrwqj9wf643";
+       revision = "1";
+       editedCabalFile = "0npwa4gv94b87y4bam9valnjlsy3rbhk7n7hdc1mx1bwkn4acyds";
        libraryHaskellDepends = [
          base deepseq hashable singletons template-haskell
        ];
@@ -73641,8 +73627,8 @@ self: {
      }:
      mkDerivation {
        pname = "fizzbuzz-as-a-service";
-       version = "0.1.0.1";
-       sha256 = "1m2pyvhdj8phj2f1zka6v1p72hzhmaigw2v0n1zwkh3k4hkq90kg";
+       version = "0.1.0.2";
+       sha256 = "0bskyv1zyk469bikh4rh6ad1i8d5ym9s89a88aw34cpphy0vq1zk";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -74644,26 +74630,6 @@ self: {
      }:
      mkDerivation {
        pname = "foldl";
-       version = "1.3.5";
-       sha256 = "10qsp7dj2xsq4q2xm6x6b12y5pq32qf7my41hnkmdwwbccvhdxb2";
-       libraryHaskellDepends = [
-         base bytestring comonad containers contravariant hashable
-         mwc-random primitive profunctors semigroups text transformers
-         unordered-containers vector vector-builder
-       ];
-       benchmarkHaskellDepends = [ base criterion ];
-       description = "Composable, streaming, and efficient left folds";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "foldl_1_3_7" = callPackage
-    ({ mkDerivation, base, bytestring, comonad, containers
-     , contravariant, criterion, hashable, mwc-random, primitive
-     , profunctors, semigroups, text, transformers, unordered-containers
-     , vector, vector-builder
-     }:
-     mkDerivation {
-       pname = "foldl";
        version = "1.3.7";
        sha256 = "113966zyk1jj8l1k1izfix8bc1hmpr9w1zahkz592f56wmvmy8kn";
        libraryHaskellDepends = [
@@ -74674,7 +74640,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Composable, streaming, and efficient left folds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "foldl-incremental" = callPackage
@@ -76241,32 +76206,6 @@ self: {
      }:
      mkDerivation {
        pname = "freer-simple";
-       version = "1.0.0.0";
-       sha256 = "11nh0majlmn6aw5qzv5jfs6jx9vxk7jn72568frmryvymn2aqax8";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base natural-transformation transformers-base
-       ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base QuickCheck tasty tasty-hunit tasty-quickcheck
-       ];
-       benchmarkHaskellDepends = [
-         base criterion extensible-effects free mtl
-       ];
-       homepage = "https://github.com/lexi-lambda/freer-simple#readme";
-       description = "Implementation of a friendly effect system for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "freer-simple_1_0_1_1" = callPackage
-    ({ mkDerivation, base, criterion, extensible-effects, free, mtl
-     , natural-transformation, QuickCheck, tasty, tasty-hunit
-     , tasty-quickcheck, transformers-base
-     }:
-     mkDerivation {
-       pname = "freer-simple";
        version = "1.0.1.1";
        sha256 = "1fdxj1iyh8jl2nghrm51r7gvlk1qwzrjjhj13f0akwrm2s0la1jb";
        isLibrary = true;
@@ -76284,7 +76223,6 @@ self: {
        homepage = "https://github.com/lexi-lambda/freer-simple#readme";
        description = "Implementation of a friendly effect system for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "freesect" = callPackage
@@ -77514,27 +77452,6 @@ self: {
      }:
      mkDerivation {
        pname = "fuzzyset";
-       version = "0.1.0.4";
-       sha256 = "1nk3qrjcg5q4mnv2lzbw08ikgibix0ns6910z9xixcfq5kgij6my";
-       libraryHaskellDepends = [
-         base base-unicode-symbols data-default lens text text-metrics
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         base base-unicode-symbols hspec ieee754 lens text
-         unordered-containers
-       ];
-       homepage = "https://github.com/laserpants/fuzzyset-haskell";
-       description = "Fuzzy set for approximate string matching";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "fuzzyset_0_1_0_6" = callPackage
-    ({ mkDerivation, base, base-unicode-symbols, data-default, hspec
-     , ieee754, lens, text, text-metrics, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "fuzzyset";
        version = "0.1.0.6";
        sha256 = "18v1zsmdgy5if7l23vciip6dbbhbpgvn0dy0ray0pqwdcw9yh6kk";
        libraryHaskellDepends = [
@@ -77548,7 +77465,6 @@ self: {
        homepage = "https://github.com/laserpants/fuzzyset-haskell";
        description = "Fuzzy set for approximate string matching";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fuzzytime" = callPackage
@@ -78451,6 +78367,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "general-games_1_1_1" = callPackage
+    ({ mkDerivation, base, hspec, HUnit, monad-loops, MonadRandom
+     , random, random-shuffle
+     }:
+     mkDerivation {
+       pname = "general-games";
+       version = "1.1.1";
+       sha256 = "1h2h6dbd12xzvgwm7a26scpjyfkcwkmpdkw98nkmb2vk8qsrx3lb";
+       libraryHaskellDepends = [
+         base monad-loops MonadRandom random random-shuffle
+       ];
+       testHaskellDepends = [ base hspec HUnit MonadRandom ];
+       homepage = "https://github.com/cgorski/general-games";
+       description = "Library supporting simulation of a number of games";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "general-prelude" = callPackage
     ({ mkDerivation, base, lens, pointless-fun, strict, system-filepath
      }:
@@ -79061,25 +78995,12 @@ self: {
     ({ mkDerivation, base, mtl, template-haskell }:
      mkDerivation {
        pname = "geniplate-mirror";
-       version = "0.7.5";
-       sha256 = "17vjps2118s5z3k39ij00lkmkxv3mqf8h59wv6qdamlgmhyr36si";
-       libraryHaskellDepends = [ base mtl template-haskell ];
-       homepage = "https://github.com/danr/geniplate";
-       description = "Use Template Haskell to generate Uniplate-like functions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "geniplate-mirror_0_7_6" = callPackage
-    ({ mkDerivation, base, mtl, template-haskell }:
-     mkDerivation {
-       pname = "geniplate-mirror";
        version = "0.7.6";
        sha256 = "1y0m0bw5zpm1y1y6d9qmxj3swl8j8hlw1shxbr5awycf6k884ssb";
        libraryHaskellDepends = [ base mtl template-haskell ];
        homepage = "https://github.com/danr/geniplate";
        description = "Use Template Haskell to generate Uniplate-like functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "geniserver" = callPackage
@@ -79670,8 +79591,8 @@ self: {
      }:
      mkDerivation {
        pname = "geos";
-       version = "0.1.0.1";
-       sha256 = "1syxxd8qg2d3l045lw0i5mchvbx3k5vhad5bxlg9pyp8isvb7wvi";
+       version = "0.1.1.1";
+       sha256 = "0z4kqlgqg016233f8smj6jzjd6n7cgsvyff0npnghv1gdlr9pfwc";
        libraryHaskellDepends = [
          base bytestring mtl transformers vector
        ];
@@ -80081,30 +80002,6 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-exactprint";
-       version = "0.5.5.0";
-       sha256 = "0k3y39k1cwb3bs85333gj7fi6l5p9nr950vgzbyswgj13qb4g7b1";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring containers directory filepath free ghc ghc-boot
-         ghc-paths mtl syb
-       ];
-       testHaskellDepends = [
-         base bytestring containers Diff directory filemanip filepath ghc
-         ghc-boot ghc-paths HUnit mtl silently syb
-       ];
-       description = "ExactPrint for GHC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "ghc-exactprint_0_5_6_0" = callPackage
-    ({ mkDerivation, base, bytestring, containers, Diff, directory
-     , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl
-     , silently, syb
-     }:
-     mkDerivation {
-       pname = "ghc-exactprint";
        version = "0.5.6.0";
        sha256 = "0fbq7p2kykqq2pzf0mld0brj3pdrgxb1zvpa05pqxsfs66czlbsg";
        isLibrary = true;
@@ -80466,29 +80363,6 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-prof";
-       version = "1.4.0.4";
-       sha256 = "037g6ianbij9gx1324fbdmamqjkn6mmw9nvqh5bwpz33srf30lpn";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         attoparsec base containers scientific text time
-       ];
-       executableHaskellDepends = [ base containers scientific text ];
-       testHaskellDepends = [
-         attoparsec base containers directory filepath process tasty
-         tasty-hunit temporary text
-       ];
-       homepage = "https://github.com/maoe/ghc-prof";
-       description = "Library for parsing GHC time and allocation profiling reports";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ghc-prof_1_4_1" = callPackage
-    ({ mkDerivation, attoparsec, base, containers, directory, filepath
-     , process, scientific, tasty, tasty-hunit, temporary, text, time
-     }:
-     mkDerivation {
-       pname = "ghc-prof";
        version = "1.4.1";
        sha256 = "1jpf2pn37vgwqcnsm799g9s9d7qbxk9d305b6i2k12573cv1x8r4";
        isLibrary = true;
@@ -80504,7 +80378,6 @@ self: {
        homepage = "https://github.com/maoe/ghc-prof";
        description = "Library for parsing GHC time and allocation profiling reports";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-prof-flamegraph" = callPackage
@@ -80902,35 +80775,6 @@ self: {
      }:
      mkDerivation {
        pname = "ghcid";
-       version = "0.6.9";
-       sha256 = "0bkhbzjjp4n97dsf8q4ggphsfh0rxwgdn4kmg8l87zbrih41gdpc";
-       revision = "1";
-       editedCabalFile = "0salqw860vc070q04n2cqd5aca4gcysxlcys8znhx6cpgyz6bn91";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base cmdargs directory extra filepath process time
-       ];
-       executableHaskellDepends = [
-         ansi-terminal base cmdargs containers directory extra filepath
-         fsnotify process terminal-size time unix
-       ];
-       testHaskellDepends = [
-         ansi-terminal base cmdargs containers directory extra filepath
-         fsnotify process tasty tasty-hunit terminal-size time unix
-       ];
-       homepage = "https://github.com/ndmitchell/ghcid#readme";
-       description = "GHCi based bare bones IDE";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ghcid_0_6_10" = callPackage
-    ({ mkDerivation, ansi-terminal, base, cmdargs, containers
-     , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit
-     , terminal-size, time, unix
-     }:
-     mkDerivation {
-       pname = "ghcid";
        version = "0.6.10";
        sha256 = "1qqd619pwdlcxvkgfawsqq19a5kl1584ra35ib8769874i6y9awj";
        isLibrary = true;
@@ -80949,7 +80793,6 @@ self: {
        homepage = "https://github.com/ndmitchell/ghcid#readme";
        description = "GHCi based bare bones IDE";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghcjs-ajax" = callPackage
@@ -82879,27 +82722,6 @@ self: {
      }:
      mkDerivation {
        pname = "github-release";
-       version = "1.1.2";
-       sha256 = "0czc53xwg21jvd7g4ggjva0nzc2rpyf36rc4876dss9lckcc2p93";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring http-client http-client-tls http-types
-         mime-types optparse-generic text unordered-containers uri-templater
-       ];
-       executableHaskellDepends = [ base ];
-       homepage = "https://github.com/tfausak/github-release#readme";
-       description = "Upload files to GitHub releases";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "github-release_1_1_3" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, http-client
-     , http-client-tls, http-types, mime-types, optparse-generic, text
-     , unordered-containers, uri-templater
-     }:
-     mkDerivation {
-       pname = "github-release";
        version = "1.1.3";
        sha256 = "040yd8npjv54xfh4fv4i1p9x6qsa5qj1m5wblr7xjf0w090sblf0";
        isLibrary = true;
@@ -82912,7 +82734,6 @@ self: {
        homepage = "https://github.com/tfausak/github-release#readme";
        description = "Upload files to GitHub releases";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "github-tools" = callPackage
@@ -91317,6 +91138,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hakyll-dir-list" = callPackage
+    ({ mkDerivation, base, containers, filepath, hakyll }:
+     mkDerivation {
+       pname = "hakyll-dir-list";
+       version = "0.1.1.0";
+       sha256 = "0j5amghlsjdnvi4klag6ifwwzy05v17bsf7j6lzl32hcx66a62qb";
+       libraryHaskellDepends = [ base containers filepath hakyll ];
+       homepage = "http://github.com/freylax/hakyll-dir-list";
+       description = "Allow Hakyll to create hierarchical menues from directories";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hakyll-elm" = callPackage
     ({ mkDerivation, base, blaze-html, blaze-markup, Elm, hakyll, mtl
      }:
@@ -92056,33 +91889,6 @@ self: {
      }:
      mkDerivation {
        pname = "hapistrano";
-       version = "0.3.5.1";
-       sha256 = "1zpvwdq9dzfkq9jh1bpc5x8vh41508x0wph5a020q31rknc8llad";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base filepath formatting gitrev mtl path process time transformers
-       ];
-       executableHaskellDepends = [
-         aeson async base formatting gitrev optparse-applicative path
-         path-io stm yaml
-       ];
-       testHaskellDepends = [
-         base directory filepath hspec mtl path path-io process temporary
-       ];
-       homepage = "https://github.com/stackbuilders/hapistrano";
-       description = "A deployment library for Haskell applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hapistrano_0_3_5_2" = callPackage
-    ({ mkDerivation, aeson, async, base, directory, filepath
-     , formatting, gitrev, hspec, mtl, optparse-applicative, path
-     , path-io, process, stm, temporary, time, transformers, yaml
-     }:
-     mkDerivation {
-       pname = "hapistrano";
        version = "0.3.5.2";
        sha256 = "0qabrvx93l8wmir4a0rg2iddsal455fx34vvdxj1ngbya25fspw4";
        isLibrary = true;
@@ -92101,7 +91907,6 @@ self: {
        homepage = "https://github.com/stackbuilders/hapistrano";
        description = "A deployment library for Haskell applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happindicator" = callPackage
@@ -92669,25 +92474,6 @@ self: {
      }:
      mkDerivation {
        pname = "happstack-server-tls";
-       version = "7.1.6.4";
-       sha256 = "1wn0yv4x619sl70fy3ffby78lfjiq9d73d4rsp3mkgr6d3kn45wj";
-       libraryHaskellDepends = [
-         base bytestring extensible-exceptions happstack-server hslogger
-         HsOpenSSL network sendfile time unix
-       ];
-       librarySystemDepends = [ openssl ];
-       homepage = "http://www.happstack.com/";
-       description = "extend happstack-server with https:// support (TLS/SSL)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) openssl;};
-
-  "happstack-server-tls_7_1_6_5" = callPackage
-    ({ mkDerivation, base, bytestring, extensible-exceptions
-     , happstack-server, hslogger, HsOpenSSL, network, openssl, sendfile
-     , time, unix
-     }:
-     mkDerivation {
-       pname = "happstack-server-tls";
        version = "7.1.6.5";
        sha256 = "0hp13wxaghs6ldqpbpyf8agph7b1y488fc516z1n6bvbpzcbhbvq";
        libraryHaskellDepends = [
@@ -92698,7 +92484,6 @@ self: {
        homepage = "http://www.happstack.com/";
        description = "extend happstack-server with https:// support (TLS/SSL)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openssl;};
 
   "happstack-server-tls-cryptonite" = callPackage
@@ -92831,24 +92616,6 @@ self: {
      }:
      mkDerivation {
        pname = "happy";
-       version = "1.19.8";
-       sha256 = "186ky3bly0i3cc56qk3r7j7pxh2108aackq4n2lli7jmbnb3kxsd";
-       isLibrary = false;
-       isExecutable = true;
-       setupHaskellDepends = [ base Cabal directory filepath ];
-       executableHaskellDepends = [ array base containers mtl ];
-       testHaskellDepends = [ base process ];
-       homepage = "https://www.haskell.org/happy/";
-       description = "Happy is a parser generator for Haskell";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "happy_1_19_9" = callPackage
-    ({ mkDerivation, array, base, Cabal, containers, directory
-     , filepath, mtl, process
-     }:
-     mkDerivation {
-       pname = "happy";
        version = "1.19.9";
        sha256 = "138xpxdb7x62lpmgmb6b3v3vgdqqvqn4273jaap3mjmc2gla709y";
        revision = "1";
@@ -92861,7 +92628,6 @@ self: {
        homepage = "https://www.haskell.org/happy/";
        description = "Happy is a parser generator for Haskell";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happy-meta" = callPackage
@@ -99046,32 +98812,6 @@ self: {
     ({ mkDerivation, ansi-terminal, async, base, bytestring
      , concurrent-output, containers, directory, exceptions
      , lifted-async, mmorph, monad-control, mtl, pretty-show, primitive
-     , random, resourcet, stm, template-haskell, text, th-lift, time
-     , transformers, transformers-base, unix, wl-pprint-annotated
-     }:
-     mkDerivation {
-       pname = "hedgehog";
-       version = "0.5.1";
-       sha256 = "0fx3dq45azxrhihhq6hlb89zkj3y8fmnfdrsz1wbvih9a3dhiwx7";
-       libraryHaskellDepends = [
-         ansi-terminal async base bytestring concurrent-output containers
-         directory exceptions lifted-async mmorph monad-control mtl
-         pretty-show primitive random resourcet stm template-haskell text
-         th-lift time transformers transformers-base unix
-         wl-pprint-annotated
-       ];
-       testHaskellDepends = [
-         base containers pretty-show text transformers
-       ];
-       homepage = "https://hedgehog.qa";
-       description = "Hedgehog will eat all your bugs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hedgehog_0_5_2" = callPackage
-    ({ mkDerivation, ansi-terminal, async, base, bytestring
-     , concurrent-output, containers, directory, exceptions
-     , lifted-async, mmorph, monad-control, mtl, pretty-show, primitive
      , random, resourcet, semigroups, stm, template-haskell, text
      , th-lift, time, transformers, transformers-base, unix
      , wl-pprint-annotated
@@ -99093,7 +98833,6 @@ self: {
        homepage = "https://hedgehog.qa";
        description = "Hedgehog will eat all your bugs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hedgehog-checkers" = callPackage
@@ -103232,6 +102971,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) openblasCompat;};
 
+  "hmatrix-backprop" = callPackage
+    ({ mkDerivation, ANum, backprop, base, finite-typelits
+     , ghc-typelits-knownnat, ghc-typelits-natnormalise, hedgehog
+     , hmatrix, hmatrix-vector-sized, microlens, microlens-platform
+     , vector, vector-sized
+     }:
+     mkDerivation {
+       pname = "hmatrix-backprop";
+       version = "0.1.0.0";
+       sha256 = "088spv7149788iwda2pyf6fc9i40vq4dfziqldgxjrnngxw9z8iv";
+       libraryHaskellDepends = [
+         ANum backprop base ghc-typelits-knownnat ghc-typelits-natnormalise
+         hmatrix hmatrix-vector-sized microlens vector vector-sized
+       ];
+       testHaskellDepends = [
+         backprop base finite-typelits hedgehog hmatrix hmatrix-vector-sized
+         microlens microlens-platform vector-sized
+       ];
+       homepage = "https://github.com/mstksg/hmatrix-backprop#readme";
+       description = "hmatrix operations lifted for backprop";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hmatrix-banded" = callPackage
     ({ mkDerivation, base, hmatrix, liblapack, transformers }:
      mkDerivation {
@@ -103473,6 +103235,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hmatrix-vector-sized" = callPackage
+    ({ mkDerivation, base, ghc-typelits-knownnat, hedgehog, hmatrix
+     , vector, vector-sized
+     }:
+     mkDerivation {
+       pname = "hmatrix-vector-sized";
+       version = "0.1.1.0";
+       sha256 = "079vq2n3w3f32dnlyxa8kn6dif0dd6nr8n1g9lnfw0d339cxqklb";
+       libraryHaskellDepends = [ base hmatrix vector vector-sized ];
+       testHaskellDepends = [
+         base ghc-typelits-knownnat hedgehog hmatrix vector vector-sized
+       ];
+       homepage = "https://github.com/mstksg/hmatrix-vector-sized#readme";
+       description = "Conversions between hmatrix and vector-sized types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hmeap" = callPackage
     ({ mkDerivation, array, base, bytestring, bytestring-lexing
      , delimited-text, parsec
@@ -104075,10 +103854,11 @@ self: {
      }:
      mkDerivation {
        pname = "hocker";
-       version = "1.0.4";
-       sha256 = "1lf8m6cd54vc436krl3j4kanmnd86r4ri45a1qp7y4qqlpplcnpf";
+       version = "1.0.5";
+       sha256 = "0xv22kiw44y72asrnk027h9gxpfhjzgdm8sbcy70s4ipn8n62hha";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson aeson-pretty ansi-wl-pprint async base bytestring
          concurrentoutput containers cryptonite data-fix deepseq directory
@@ -105410,26 +105190,6 @@ self: {
      }) {};
 
   "hourglass" = callPackage
-    ({ mkDerivation, base, bytestring, criterion, deepseq, mtl
-     , old-locale, tasty, tasty-hunit, tasty-quickcheck, time
-     }:
-     mkDerivation {
-       pname = "hourglass";
-       version = "0.2.10";
-       sha256 = "104d1yd84hclprg740nkz60vx589mnm094zriw6zczbgg8nkclym";
-       libraryHaskellDepends = [ base deepseq ];
-       testHaskellDepends = [
-         base deepseq mtl old-locale tasty tasty-hunit tasty-quickcheck time
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion deepseq mtl old-locale time
-       ];
-       homepage = "https://github.com/vincenthz/hs-hourglass";
-       description = "simple performant time related library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hourglass_0_2_11" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, gauge, mtl, old-locale
      , tasty, tasty-hunit, tasty-quickcheck, time
      }:
@@ -105447,7 +105207,6 @@ self: {
        homepage = "https://github.com/vincenthz/hs-hourglass";
        description = "simple performant time related library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hourglass-fuzzy-parsing" = callPackage
@@ -105651,6 +105410,8 @@ self: {
        pname = "hpack";
        version = "0.25.0";
        sha256 = "0nz8hrfw59pcd685qqkhikwwzrg5aaiynlxlsga8gqfzx0gsjwip";
+       revision = "1";
+       editedCabalFile = "0z4bnrikf4mnf9slij1f58y2lkayag5ni1s027rimayjgpdigds1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -105989,37 +105750,6 @@ self: {
 
   "hpio" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, directory
-     , doctest, exceptions, filepath, hlint, hspec, monad-control
-     , monad-logger, mtl, optparse-applicative, protolude, QuickCheck
-     , text, transformers, transformers-base, unix, unix-bytestring
-     }:
-     mkDerivation {
-       pname = "hpio";
-       version = "0.9.0.3";
-       sha256 = "0cz7dxxxxfr142gr3hrq1k1x8axdgvyw7bsjsd1v9spka2i03rcd";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring containers directory exceptions filepath
-         monad-control monad-logger mtl protolude QuickCheck text
-         transformers transformers-base unix unix-bytestring
-       ];
-       executableHaskellDepends = [
-         async base exceptions mtl optparse-applicative protolude text
-         transformers
-       ];
-       testHaskellDepends = [
-         base containers directory doctest exceptions filepath hlint hspec
-         protolude QuickCheck
-       ];
-       homepage = "https://github.com/quixoftic/hpio#readme";
-       description = "Monads for GPIO in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hpio_0_9_0_5" = callPackage
-    ({ mkDerivation, async, base, bytestring, containers, directory
      , doctest, exceptions, filepath, hspec, monad-control, monad-logger
      , mtl, optparse-applicative, protolude, QuickCheck, text
      , transformers, transformers-base, unix, unix-bytestring
@@ -106210,6 +105940,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hprotoc_2_4_7" = callPackage
+    ({ mkDerivation, alex, array, base, binary, bytestring, containers
+     , directory, filepath, haskell-src-exts, mtl, parsec
+     , protocol-buffers, protocol-buffers-descriptor, utf8-string
+     }:
+     mkDerivation {
+       pname = "hprotoc";
+       version = "2.4.7";
+       sha256 = "0rbifp2n2vb2bhk8wgdkmp0q2dqv7vlcwsqgpl8b7xhkfn706ps5";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base binary bytestring containers directory filepath
+         haskell-src-exts mtl parsec protocol-buffers
+         protocol-buffers-descriptor utf8-string
+       ];
+       libraryToolDepends = [ alex ];
+       executableHaskellDepends = [
+         array base binary bytestring containers directory filepath
+         haskell-src-exts mtl parsec protocol-buffers
+         protocol-buffers-descriptor utf8-string
+       ];
+       executableToolDepends = [ alex ];
+       homepage = "https://github.com/k-bx/protocol-buffers";
+       description = "Parse Google Protocol Buffer specifications";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hprotoc-fork" = callPackage
     ({ mkDerivation, alex, array, base, binary, bytestring, containers
      , directory, filepath, haskell-src-exts, mtl, parsec
@@ -107181,22 +106940,23 @@ self: {
 
   "hs2ats" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, cases, composition-prelude
-     , criterion, deepseq, haskell-src-exts, hspec, hspec-dirstream
-     , language-ats, lens, optparse-generic, system-filepath, text
+     , cpphs, criterion, deepseq, haskell-src-exts, hspec
+     , hspec-dirstream, language-ats, lens, optparse-generic
+     , system-filepath, text
      }:
      mkDerivation {
        pname = "hs2ats";
-       version = "0.2.1.3";
-       sha256 = "1np1sd6s6dxq0kd87w5bf98xkffjaj354s9g7ah1fjmr36shvwib";
+       version = "0.2.1.5";
+       sha256 = "0jxyj9pggs4m2ypw12z5xjrc5r0cq5gxi3dllbmvvablxlwzfkv1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ansi-wl-pprint base cases composition-prelude deepseq
+         ansi-wl-pprint base cases composition-prelude cpphs deepseq
          haskell-src-exts language-ats lens optparse-generic text
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
-         base hspec hspec-dirstream language-ats system-filepath
+         base hspec hspec-dirstream system-filepath
        ];
        benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com/vmchale/hs2ats#readme";
@@ -108128,23 +107888,6 @@ self: {
     ({ mkDerivation, adns, base, containers, network }:
      mkDerivation {
        pname = "hsdns";
-       version = "1.7";
-       sha256 = "1lsw422k64b8m7s98j1i6qxll1kyzpv3bb0a2wwf7lghw74hm5j8";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base containers network ];
-       librarySystemDepends = [ adns ];
-       executableHaskellDepends = [ base network ];
-       homepage = "http://github.com/peti/hsdns";
-       description = "Asynchronous DNS Resolver";
-       license = stdenv.lib.licenses.lgpl3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
-     }) {inherit (pkgs) adns;};
-
-  "hsdns_1_7_1" = callPackage
-    ({ mkDerivation, adns, base, containers, network }:
-     mkDerivation {
-       pname = "hsdns";
        version = "1.7.1";
        sha256 = "0i50p31zxsrkx9hv3mqcl2042lf922b1fsswmd99d66ybkl01kag";
        isLibrary = true;
@@ -108154,7 +107897,6 @@ self: {
        homepage = "http://github.com/peti/hsdns";
        description = "Asynchronous DNS Resolver";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {inherit (pkgs) adns;};
 
@@ -108771,6 +108513,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hsmodetweaks" = callPackage
+    ({ mkDerivation, base, containers, directory, hpack, protolude
+     , text
+     }:
+     mkDerivation {
+       pname = "hsmodetweaks";
+       version = "0.1.0.1";
+       sha256 = "1nwmfd6wvwis58z97amgzix42mcqj5nsj915593w2cw7j5sv5y17";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base containers directory hpack protolude text
+       ];
+       homepage = "https://github.com/mwotton/scriptable/#hsmodetweaks";
+       description = "Tool for generating .dir-locals.el for intero";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hsmtpclient" = callPackage
     ({ mkDerivation, array, base, directory, network, old-time }:
      mkDerivation {
@@ -109075,15 +108835,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec_2_4_7" = callPackage
+  "hspec_2_4_8" = callPackage
     ({ mkDerivation, base, call-stack, directory, hspec-core
      , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck
      , stringbuilder, transformers
      }:
      mkDerivation {
        pname = "hspec";
-       version = "2.4.7";
-       sha256 = "1jvf7x43gkch4b8nxqdascqlh4rh2d1qvl44skwqkz0gw154ldan";
+       version = "2.4.8";
+       sha256 = "18pddkfz661b1nr1nziq8cnmlzxiqzzmrcrk3iwn476vi3bf1m4l";
        libraryHaskellDepends = [
          base call-stack hspec-core hspec-discover hspec-expectations HUnit
          QuickCheck transformers
@@ -109174,25 +108934,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec-core_2_4_7" = callPackage
-    ({ mkDerivation, ansi-terminal, array, async, base, call-stack
-     , deepseq, directory, filepath, hspec-expectations, hspec-meta
-     , HUnit, process, QuickCheck, quickcheck-io, random, setenv
-     , silently, temporary, tf-random, time, transformers
+  "hspec-core_2_4_8" = callPackage
+    ({ mkDerivation, ansi-terminal, array, base, call-stack, deepseq
+     , directory, filepath, hspec-expectations, hspec-meta, HUnit
+     , process, QuickCheck, quickcheck-io, random, setenv, silently, stm
+     , temporary, tf-random, time, transformers
      }:
      mkDerivation {
        pname = "hspec-core";
-       version = "2.4.7";
-       sha256 = "0syjbx3s62shwddp75qj0nfwmfjn0yflja4bh23x161xpx1g0igx";
+       version = "2.4.8";
+       sha256 = "02zr6n7mqdncvf1braf38zjdplaxrkg11x9k8717k4yg57585ji4";
        libraryHaskellDepends = [
-         ansi-terminal array async base call-stack deepseq directory
-         filepath hspec-expectations HUnit QuickCheck quickcheck-io random
-         setenv tf-random time transformers
+         ansi-terminal array base call-stack deepseq directory filepath
+         hspec-expectations HUnit QuickCheck quickcheck-io random setenv stm
+         tf-random time transformers
        ];
        testHaskellDepends = [
-         ansi-terminal array async base call-stack deepseq directory
-         filepath hspec-expectations hspec-meta HUnit process QuickCheck
-         quickcheck-io random setenv silently temporary tf-random time
+         ansi-terminal array base call-stack deepseq directory filepath
+         hspec-expectations hspec-meta HUnit process QuickCheck
+         quickcheck-io random setenv silently stm temporary tf-random time
          transformers
        ];
        testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'";
@@ -109237,13 +108997,13 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec-discover_2_4_7" = callPackage
+  "hspec-discover_2_4_8" = callPackage
     ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
      }:
      mkDerivation {
        pname = "hspec-discover";
-       version = "2.4.7";
-       sha256 = "1cgj6c6f5vpn36jg2j7v80nr87x1dsf7qyvxvjw8qimjdxrcx0ba";
+       version = "2.4.8";
+       sha256 = "0llwdfpjgfpi7dr8caw0fldb9maqznmqh4awkvx72bz538gqmlka";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory filepath ];
@@ -110607,25 +110367,6 @@ self: {
      }:
      mkDerivation {
        pname = "hsx2hs";
-       version = "0.14.1.1";
-       sha256 = "0hymdradb2vsx7gpdwrlmkv1qg4p2r5l6pfiqc4ijyn152jrgr7b";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring haskell-src-exts haskell-src-meta mtl
-         template-haskell utf8-string
-       ];
-       homepage = "https://github.com/seereason/hsx2hs";
-       description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hsx2hs_0_14_1_2" = callPackage
-    ({ mkDerivation, base, bytestring, haskell-src-exts
-     , haskell-src-meta, mtl, template-haskell, utf8-string
-     }:
-     mkDerivation {
-       pname = "hsx2hs";
        version = "0.14.1.2";
        sha256 = "06j2nc2yg8a8pp3c2ayxrm76fj2w2w5d2ilq91hvwwb1ikrklg5b";
        isLibrary = true;
@@ -110637,7 +110378,6 @@ self: {
        homepage = "https://github.com/seereason/hsx2hs";
        description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsyscall" = callPackage
@@ -111275,34 +111015,6 @@ self: {
   "http-api-data" = callPackage
     ({ mkDerivation, attoparsec, attoparsec-iso8601, base, bytestring
      , Cabal, cabal-doctest, containers, directory, doctest, filepath
-     , hashable, hspec, http-types, HUnit, QuickCheck
-     , quickcheck-instances, text, time, time-locale-compat
-     , unordered-containers, uri-bytestring, uuid, uuid-types
-     }:
-     mkDerivation {
-       pname = "http-api-data";
-       version = "0.3.7.1";
-       sha256 = "1zbmf0kkfsw7pfznisi205gh7jd284gfarxsyiavd2iw26akwqwc";
-       revision = "1";
-       editedCabalFile = "0g57k71bssf81yba6xf9fcxlys8m5ax5kvrs4gvckahf5ihdxds6";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         attoparsec attoparsec-iso8601 base bytestring containers hashable
-         http-types text time time-locale-compat unordered-containers
-         uri-bytestring uuid-types
-       ];
-       testHaskellDepends = [
-         base bytestring directory doctest filepath hspec HUnit QuickCheck
-         quickcheck-instances text time unordered-containers uuid
-       ];
-       homepage = "http://github.com/fizruk/http-api-data";
-       description = "Converting to/from HTTP API data like URL pieces, headers and query parameters";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "http-api-data_0_3_7_2" = callPackage
-    ({ mkDerivation, attoparsec, attoparsec-iso8601, base, bytestring
-     , Cabal, cabal-doctest, containers, directory, doctest, filepath
      , hashable, hspec, hspec-discover, http-types, HUnit, QuickCheck
      , quickcheck-instances, text, time, time-locale-compat
      , unordered-containers, uri-bytestring, uuid, uuid-types
@@ -111325,7 +111037,6 @@ self: {
        homepage = "http://github.com/fizruk/http-api-data";
        description = "Converting to/from HTTP API data like URL pieces, headers and query parameters";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-attoparsec" = callPackage
@@ -111350,35 +111061,6 @@ self: {
      }:
      mkDerivation {
        pname = "http-client";
-       version = "0.5.9";
-       sha256 = "0bccpvinzc7z5v83grjzvd3g3kdz2q5h2206l7x9jh4bvz9prblf";
-       libraryHaskellDepends = [
-         array base base64-bytestring blaze-builder bytestring
-         case-insensitive containers cookie deepseq exceptions filepath
-         ghc-prim http-types mime-types network network-uri random stm
-         streaming-commons text time transformers
-       ];
-       testHaskellDepends = [
-         async base base64-bytestring blaze-builder bytestring
-         case-insensitive containers deepseq directory hspec http-types
-         monad-control network network-uri streaming-commons text time
-         transformers zlib
-       ];
-       doCheck = false;
-       homepage = "https://github.com/snoyberg/http-client";
-       description = "An HTTP client engine";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "http-client_0_5_10" = callPackage
-    ({ mkDerivation, array, async, base, base64-bytestring
-     , blaze-builder, bytestring, case-insensitive, containers, cookie
-     , deepseq, directory, exceptions, filepath, ghc-prim, hspec
-     , http-types, mime-types, monad-control, network, network-uri
-     , random, stm, streaming-commons, text, time, transformers, zlib
-     }:
-     mkDerivation {
-       pname = "http-client";
        version = "0.5.10";
        sha256 = "1hmshs97smigqy334rfkgv3vri5fas3cj8zz2gqlby9jsrp6kygm";
        libraryHaskellDepends = [
@@ -111397,7 +111079,6 @@ self: {
        homepage = "https://github.com/snoyberg/http-client";
        description = "An HTTP client engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-client-auth" = callPackage
@@ -111552,29 +111233,6 @@ self: {
 
   "http-client-tls" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, connection
-     , containers, criterion, cryptonite, data-default-class, exceptions
-     , hspec, http-client, http-types, memory, network, network-uri
-     , text, tls, transformers
-     }:
-     mkDerivation {
-       pname = "http-client-tls";
-       version = "0.3.5.1";
-       sha256 = "0n4mi8z77qaggfyq17z79cl304nf1f4h6gag60v4wjwghvmj7yn1";
-       libraryHaskellDepends = [
-         base bytestring case-insensitive connection containers cryptonite
-         data-default-class exceptions http-client http-types memory network
-         network-uri text tls transformers
-       ];
-       testHaskellDepends = [ base hspec http-client http-types ];
-       benchmarkHaskellDepends = [ base criterion http-client ];
-       doCheck = false;
-       homepage = "https://github.com/snoyberg/http-client";
-       description = "http-client backend using the connection package and tls library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "http-client-tls_0_3_5_3" = callPackage
-    ({ mkDerivation, base, bytestring, case-insensitive, connection
      , containers, cryptonite, data-default-class, exceptions, gauge
      , hspec, http-client, http-types, memory, network, network-uri
      , text, tls, transformers
@@ -111596,7 +111254,6 @@ self: {
        homepage = "https://github.com/snoyberg/http-client";
        description = "http-client backend using the connection package and tls library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-common" = callPackage
@@ -111908,27 +111565,6 @@ self: {
      }:
      mkDerivation {
        pname = "http-media";
-       version = "0.7.1.1";
-       sha256 = "0k58368im14jwsd4wpyw9kl166zbi14ccl3adjigx8yf8k61n7zz";
-       libraryHaskellDepends = [
-         base bytestring case-insensitive containers utf8-string
-       ];
-       testHaskellDepends = [
-         base bytestring case-insensitive containers QuickCheck
-         test-framework test-framework-quickcheck2 utf8-string
-       ];
-       homepage = "https://github.com/zmthy/http-media";
-       description = "Processing HTTP Content-Type and Accept headers";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "http-media_0_7_1_2" = callPackage
-    ({ mkDerivation, base, bytestring, case-insensitive, containers
-     , QuickCheck, test-framework, test-framework-quickcheck2
-     , utf8-string
-     }:
-     mkDerivation {
-       pname = "http-media";
        version = "0.7.1.2";
        sha256 = "01vvrd6yb2aykha7y1c13ylnkyws2wy68vqbdb7kmbzwbdxdb4zy";
        libraryHaskellDepends = [
@@ -111941,7 +111577,6 @@ self: {
        homepage = "https://github.com/zmthy/http-media";
        description = "Processing HTTP Content-Type and Accept headers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-monad" = callPackage
@@ -112658,8 +112293,8 @@ self: {
     ({ mkDerivation, base, text }:
      mkDerivation {
        pname = "human-parse";
-       version = "0.1.0.2";
-       sha256 = "1p7r26b3845fbdp2lxv6pqbqrlfzna8qsh7k3b1rkj3qlbw64rym";
+       version = "0.1.0.3";
+       sha256 = "0lr2m5gci1k0x7w1i49cb6nhbnnkym4raaagn916ahf79y05jv7d";
        libraryHaskellDepends = [ base text ];
        homepage = "https://github.com/chris-martin/human";
        description = "A lawless typeclass for parsing text entered by humans";
@@ -112685,8 +112320,8 @@ self: {
     ({ mkDerivation, base, text }:
      mkDerivation {
        pname = "human-text";
-       version = "0.1.0.2";
-       sha256 = "1jq9ksszwiy0bddw5c0zx037ig0gvsc5k030h6znkvmkpcvg096q";
+       version = "0.1.0.3";
+       sha256 = "0v6wrs9mcmiwk9ladjcibw1yqpbbl0y6v9i3ni39v0byby0a2zpa";
        libraryHaskellDepends = [ base text ];
        homepage = "https://github.com/chris-martin/human";
        description = "A lawless typeclass for converting values to human-friendly text";
@@ -115916,20 +115551,6 @@ self: {
     ({ mkDerivation, base, process }:
      mkDerivation {
        pname = "ihs";
-       version = "0.1.0.1";
-       sha256 = "0q7wa5pgf4ga7pmjwjxacqmdbhqricsv9xkzfrcg314lag8wvdgb";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [ base process ];
-       homepage = "https://github.com/minad/ihs";
-       description = "Interpolated Haskell";
-       license = stdenv.lib.licenses.publicDomain;
-     }) {};
-
-  "ihs_0_1_0_2" = callPackage
-    ({ mkDerivation, base, process }:
-     mkDerivation {
-       pname = "ihs";
        version = "0.1.0.2";
        sha256 = "0cprv8g7kz07s5954020ac9yfggf3d2wmwp4xa61q4sz5rs7wiwq";
        isLibrary = false;
@@ -115938,7 +115559,6 @@ self: {
        homepage = "https://github.com/minad/ihs";
        description = "Interpolated Haskell";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihttp" = callPackage
@@ -116927,6 +116547,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "indexed-list-literals" = callPackage
+    ({ mkDerivation, base, OneTuple }:
+     mkDerivation {
+       pname = "indexed-list-literals";
+       version = "0.1.0.1";
+       sha256 = "1l38x0s90gfsrfz43k9sx0xbv4pg93m2pfm6hy3rk52wdxrw0qad";
+       libraryHaskellDepends = [ base OneTuple ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/davidm-d/indexed-list-literals";
+       description = "Type safe indexed list literals";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "indextype" = callPackage
     ({ mkDerivation, base, hspec }:
      mkDerivation {
@@ -117132,37 +116765,6 @@ self: {
      }:
      mkDerivation {
        pname = "influxdb";
-       version = "1.2.2.2";
-       sha256 = "18aijaz7lv64zqkpydmny8nga48fg5lsbmphlk7b92hcfbp8vw4f";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring clock containers foldl http-client
-         http-types lens network optional-args scientific text time
-         unordered-containers vector
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring containers foldl http-client lens mwc-random
-         network optional-args text time vector
-       ];
-       testHaskellDepends = [
-         base http-client HUnit mtl tasty tasty-hunit tasty-quickcheck
-         tasty-th text vector
-       ];
-       homepage = "https://github.com/maoe/influxdb-haskell";
-       description = "Haskell client library for InfluxDB";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "influxdb_1_2_2_3" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, clock
-     , containers, foldl, http-client, http-types, HUnit, lens, mtl
-     , mwc-random, network, optional-args, scientific, tasty
-     , tasty-hunit, tasty-quickcheck, tasty-th, text, time
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "influxdb";
        version = "1.2.2.3";
        sha256 = "14454644vlkyd27ywhsvkczxdxdwqkl917zcb51ay68gdnrrwm1i";
        isLibrary = true;
@@ -117183,7 +116785,6 @@ self: {
        homepage = "https://github.com/maoe/influxdb-haskell";
        description = "Haskell client library for InfluxDB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "informative" = callPackage
@@ -117974,18 +117575,20 @@ self: {
   "intero" = 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
+     , network, process, random, regex-compat, syb, temporary, time
+     , transformers, unix
      }:
      mkDerivation {
        pname = "intero";
-       version = "0.1.24";
-       sha256 = "022ad802z5h55az357047sf6fngp08by7ms71r2kiqkzbccldqgv";
+       version = "0.1.26";
+       sha256 = "1f00ma72hmhb3cd9pfhkcks3878ni690bcqw53lrbp6f6b4r5p5v";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [
          array base bytestring containers directory filepath ghc ghc-boot-th
-         ghc-paths ghci haskeline process syb time transformers unix
+         ghc-paths ghci haskeline network process random syb time
+         transformers unix
        ];
        testHaskellDepends = [
          base directory filepath hspec process regex-compat temporary
@@ -118959,17 +118562,17 @@ self: {
   "irc-client" = callPackage
     ({ mkDerivation, base, bytestring, conduit, connection, containers
      , contravariant, exceptions, irc-conduit, irc-ctcp, mtl
-     , network-conduit-tls, old-locale, profunctors, stm, stm-conduit
+     , network-conduit-tls, old-locale, profunctors, stm, stm-chans
      , text, time, tls, transformers, x509, x509-store, x509-validation
      }:
      mkDerivation {
        pname = "irc-client";
-       version = "1.0.1.0";
-       sha256 = "0c0vzmzpryjfv22kxinnqjf7rkj51dz7shi1gn8ivgcmnhf9hl57";
+       version = "1.0.1.1";
+       sha256 = "1d5xy2q5pkyn4i6d9myw27wr75xci05s446l23kdjli2ldh0g4nx";
        libraryHaskellDepends = [
          base bytestring conduit connection containers contravariant
          exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale
-         profunctors stm stm-conduit text time tls transformers x509
+         profunctors stm stm-chans text time tls transformers x509
          x509-store x509-validation
        ];
        homepage = "https://github.com/barrucadu/irc-client";
@@ -119017,8 +118620,8 @@ self: {
      }:
      mkDerivation {
        pname = "irc-conduit";
-       version = "0.2.2.4";
-       sha256 = "118ksbf8kh0bmwk5m32qv609kggwssm3a56zc14f8bg67bkdkrc4";
+       version = "0.2.2.5";
+       sha256 = "1f9dvs4z15wym2a7dpm9h7m3ffpj8d089k6q28my6yx10mi93ksj";
        libraryHaskellDepends = [
          async base bytestring conduit conduit-extra connection irc irc-ctcp
          network-conduit-tls profunctors text time tls transformers
@@ -119234,20 +118837,21 @@ self: {
 
   "iri" = callPackage
     ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring
-     , contravariant, ip, profunctors, ptr, punycode, QuickCheck
-     , quickcheck-instances, rerebase, semigroups, tasty, tasty-hunit
-     , tasty-quickcheck, template-haskell, text, text-builder, th-lift
-     , th-lift-instances, unordered-containers, vector, vector-builder
+     , contravariant, hashable, ip, profunctors, ptr, punycode
+     , QuickCheck, quickcheck-instances, rerebase, semigroups, tasty
+     , tasty-hunit, tasty-quickcheck, template-haskell, text
+     , text-builder, th-lift, th-lift-instances, unordered-containers
+     , vector, vector-builder, vector-instances
      }:
      mkDerivation {
        pname = "iri";
-       version = "0.3";
-       sha256 = "008ydrls1gyh0jvcjc51zlgzbkq7ajd8pvyfc4zqgprv9naym9zm";
+       version = "0.3.3";
+       sha256 = "10apl3d1rxc36i50zvfigwqfdk79rg15ir0ga7x9bxa8kjy6szp1";
        libraryHaskellDepends = [
-         attoparsec base base-prelude bug bytestring contravariant ip
-         profunctors ptr punycode semigroups template-haskell text
+         attoparsec base base-prelude bug bytestring contravariant hashable
+         ip profunctors ptr punycode semigroups template-haskell text
          text-builder th-lift th-lift-instances unordered-containers vector
-         vector-builder
+         vector-builder vector-instances
        ];
        testHaskellDepends = [
          QuickCheck quickcheck-instances rerebase tasty tasty-hunit
@@ -121354,6 +120958,8 @@ self: {
        pname = "json-autotype";
        version = "1.0.18";
        sha256 = "0h2aiq7k6s2qw81mrj77i86vfaci0387cwm6lbfzfag3r4993w7h";
+       revision = "1";
+       editedCabalFile = "0f67frvi5jsn47w02kqi834mkjy4kz451fic5m4i24lyykw19kvm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -122345,6 +121951,24 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "justified-containers_0_3_0_0" = callPackage
+    ({ mkDerivation, base, containers, ghc-prim, hspec, QuickCheck
+     , roles, should-not-typecheck
+     }:
+     mkDerivation {
+       pname = "justified-containers";
+       version = "0.3.0.0";
+       sha256 = "11ryff281gbn46zz7vax97h0qn5xn1mk7gdjpb38xs9ns36c0c6q";
+       libraryHaskellDepends = [ base containers roles ];
+       testHaskellDepends = [
+         base containers ghc-prim hspec QuickCheck should-not-typecheck
+       ];
+       homepage = "https://github.com/matt-noonan/justified-containers";
+       description = "Keyed container types with type-checked proofs of key presence";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "jvm" = callPackage
     ({ mkDerivation, base, bytestring, choice, constraints, criterion
      , deepseq, distributed-closure, exceptions, hspec, jni, singletons
@@ -122933,39 +122557,6 @@ self: {
      }:
      mkDerivation {
        pname = "katip-elasticsearch";
-       version = "0.4.0.3";
-       sha256 = "0aji0738dz7i0lry30y6rpfbhvcpc79mfqc77nlvaplb3plw0m51";
-       libraryHaskellDepends = [
-         aeson async base bloodhound bytestring enclosed-exceptions
-         exceptions http-client http-types katip retry scientific stm
-         stm-chans text time transformers unordered-containers uuid
-       ];
-       testHaskellDepends = [
-         aeson base bloodhound bytestring containers http-client http-types
-         katip lens lens-aeson quickcheck-instances scientific stm tagged
-         tasty tasty-hunit tasty-quickcheck text time transformers
-         unordered-containers vector
-       ];
-       benchmarkHaskellDepends = [
-         aeson base bloodhound criterion deepseq random text
-         unordered-containers uuid
-       ];
-       homepage = "https://github.com/Soostone/katip";
-       description = "ElasticSearch scribe for the Katip logging framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "katip-elasticsearch_0_4_0_4" = callPackage
-    ({ mkDerivation, aeson, async, base, bloodhound, bytestring
-     , containers, criterion, deepseq, enclosed-exceptions, exceptions
-     , http-client, http-types, katip, lens, lens-aeson
-     , quickcheck-instances, random, retry, scientific, stm, stm-chans
-     , tagged, tasty, tasty-hunit, tasty-quickcheck, text, time
-     , transformers, unordered-containers, uuid, vector
-     }:
-     mkDerivation {
-       pname = "katip-elasticsearch";
        version = "0.4.0.4";
        sha256 = "0zg0f5czqff9zd0rnkj68bmxmizrl01q4wbvz43hj5j8mj0jzybj";
        libraryHaskellDepends = [
@@ -125427,8 +125018,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-ats";
-       version = "0.2.0.5";
-       sha256 = "12dnyx6z644f1i5f3mybqisa3x8kfsvbqvd0ab0lyg4mv1b9c6lh";
+       version = "0.3.0.1";
+       sha256 = "0afp2r77h8z0fx5qxxadb4vxnrj76varfisr12p7r0nm4ljy6vmz";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-terminal ansi-wl-pprint array base composition-prelude deepseq
@@ -126250,54 +125841,6 @@ self: {
      , lens-aeson, megaparsec, memory, mtl, neat-interpolation
      , operational, optparse-applicative, parallel-io, parsec
      , pcre-utils, process, protolude, random, regex-pcre-builtin
-     , scientific, semigroups, servant, servant-client, split, stm
-     , strict-base-types, temporary, text, time, transformers, unix
-     , unordered-containers, vector, yaml
-     }:
-     mkDerivation {
-       pname = "language-puppet";
-       version = "1.3.13";
-       sha256 = "1qngbjpyxd7m4jawc40095v84a8bgk4xk7an9lb1yzp739nvcln1";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring
-         case-insensitive containers cryptonite directory exceptions
-         filecache filepath formatting hashable hruby hslogger hspec
-         http-api-data http-client lens lens-aeson megaparsec memory mtl
-         operational parsec pcre-utils process protolude random
-         regex-pcre-builtin scientific semigroups servant servant-client
-         split stm strict-base-types text time transformers unix
-         unordered-containers vector yaml
-       ];
-       executableHaskellDepends = [
-         aeson ansi-wl-pprint base bytestring containers Glob hslogger
-         http-client lens megaparsec mtl optparse-applicative parallel-io
-         regex-pcre-builtin servant-client strict-base-types text
-         transformers unordered-containers vector yaml
-       ];
-       testHaskellDepends = [
-         ansi-wl-pprint base Glob hslogger hspec hspec-megaparsec HUnit lens
-         megaparsec mtl neat-interpolation protolude scientific
-         strict-base-types temporary text transformers unix
-         unordered-containers vector
-       ];
-       homepage = "http://lpuppet.banquise.net/";
-       description = "Tools to parse and evaluate the Puppet DSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-linux" ];
-     }) {};
-
-  "language-puppet_1_3_14" = callPackage
-    ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
-     , base16-bytestring, bytestring, case-insensitive, containers
-     , cryptonite, directory, exceptions, filecache, filepath
-     , formatting, Glob, hashable, hruby, hslogger, hspec
-     , hspec-megaparsec, http-api-data, http-client, HUnit, lens
-     , lens-aeson, megaparsec, memory, mtl, neat-interpolation
-     , operational, optparse-applicative, parallel-io, parsec
-     , pcre-utils, process, protolude, random, regex-pcre-builtin
      , scientific, servant, servant-client, split, stm
      , strict-base-types, temporary, text, time, transformers, unix
      , unordered-containers, vector, yaml
@@ -126334,7 +125877,7 @@ self: {
        homepage = "http://lpuppet.banquise.net/";
        description = "Tools to parse and evaluate the Puppet DSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "x86_64-linux" ];
      }) {};
 
   "language-python" = callPackage
@@ -127145,19 +126688,6 @@ self: {
      }) {};
 
   "lca" = callPackage
-    ({ mkDerivation, base, doctest }:
-     mkDerivation {
-       pname = "lca";
-       version = "0.3";
-       sha256 = "081fk0ci5vb84w4zwah6qwbr0i78v2pr6m6nn1y226vv5w3kakza";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base doctest ];
-       homepage = "http://github.com/ekmett/lca/";
-       description = "O(log n) persistent on-line lowest common ancestor calculation without preprocessing";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "lca_0_3_1" = callPackage
     ({ mkDerivation, base, Cabal, cabal-doctest, doctest }:
      mkDerivation {
        pname = "lca";
@@ -127169,7 +126699,6 @@ self: {
        homepage = "http://github.com/ekmett/lca/";
        description = "O(log n) persistent online lowest common ancestor search without preprocessing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lcs" = callPackage
@@ -130654,15 +130183,15 @@ self: {
      }) {};
 
   "list-t-libcurl" = callPackage
-    ({ mkDerivation, base, base-prelude, bytestring, curlhs, either
-     , list-t, mtl-prelude, resource-pool, stm
+    ({ mkDerivation, base, base-prelude, bytestring, curlhs, list-t
+     , mtl-prelude, resource-pool, stm
      }:
      mkDerivation {
        pname = "list-t-libcurl";
-       version = "0.3.1";
-       sha256 = "0bfyz3k38ns8zak1lyyz4bkl6gd8yylwqpgwddxdpdbk9n4smj7h";
+       version = "0.3.3";
+       sha256 = "0sm1aflzh5ahnpyp0rbrx6c7pl53agd1170hffn3y9w45zp3dpq2";
        libraryHaskellDepends = [
-         base base-prelude bytestring curlhs either list-t mtl-prelude
+         base base-prelude bytestring curlhs list-t mtl-prelude
          resource-pool stm
        ];
        homepage = "https://github.com/nikita-volkov/list-t-libcurl";
@@ -132051,29 +131580,6 @@ self: {
      }:
      mkDerivation {
        pname = "logging-effect";
-       version = "1.2.1";
-       sha256 = "1jjw2ach3mni7pnfcw29z2fw5vffhq8i8qh8sn4n4jcya2mfp7xd";
-       libraryHaskellDepends = [
-         async base exceptions free monad-control mtl semigroups stm
-         stm-delay text time transformers transformers-base wl-pprint-text
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion fast-logger lifted-async monad-logger
-         text time wl-pprint-text
-       ];
-       homepage = "https://github.com/ocharles/logging-effect";
-       description = "A mtl-style monad transformer for general purpose & compositional logging";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "logging-effect_1_2_3" = callPackage
-    ({ mkDerivation, async, base, bytestring, criterion, exceptions
-     , fast-logger, free, lifted-async, monad-control, monad-logger, mtl
-     , semigroups, stm, stm-delay, text, time, transformers
-     , transformers-base, wl-pprint-text
-     }:
-     mkDerivation {
-       pname = "logging-effect";
        version = "1.2.3";
        sha256 = "0822ifll474q3aqh5jjavhryrlz331p2zc5hh4zi47wviyfm8brk";
        libraryHaskellDepends = [
@@ -132087,7 +131593,6 @@ self: {
        homepage = "https://github.com/ocharles/logging-effect";
        description = "A mtl-style monad transformer for general purpose & compositional logging";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "logging-effect-extra" = callPackage
@@ -132096,26 +131601,6 @@ self: {
      }:
      mkDerivation {
        pname = "logging-effect-extra";
-       version = "1.2.1";
-       sha256 = "0sk4wagknvspn45lll1sy5jx3vz1ljsjj3yabyx7cnlyf5bl3k61";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base logging-effect logging-effect-extra-file
-         logging-effect-extra-handler wl-pprint-text
-       ];
-       executableHaskellDepends = [ base ];
-       homepage = "https://github.com/jship/logging-effect-extra#readme";
-       description = "Supplemental packages for `logging-effect`";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "logging-effect-extra_1_2_2" = callPackage
-    ({ mkDerivation, base, logging-effect, logging-effect-extra-file
-     , logging-effect-extra-handler, wl-pprint-text
-     }:
-     mkDerivation {
-       pname = "logging-effect-extra";
        version = "1.2.2";
        sha256 = "0jra1fxz3880ds8pip1mlibiss8ihd1a9dpi3mv1py7lnc6ikjzw";
        isLibrary = true;
@@ -132128,7 +131613,6 @@ self: {
        homepage = "https://github.com/jship/logging-effect-extra#readme";
        description = "Supplemental packages for `logging-effect`";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "logging-effect-extra-file" = callPackage
@@ -132137,25 +131621,6 @@ self: {
      }:
      mkDerivation {
        pname = "logging-effect-extra-file";
-       version = "1.1.1";
-       sha256 = "198mil2v6z13gv7m37lqhqpdfsgk3l231rm9anq9pj7z2x4xqcpw";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base logging-effect template-haskell wl-pprint-text
-       ];
-       executableHaskellDepends = [ base logging-effect wl-pprint-text ];
-       homepage = "https://github.com/jship/logging-effect-extra#readme";
-       description = "TH splices to augment log messages with file info";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "logging-effect-extra-file_1_1_2" = callPackage
-    ({ mkDerivation, base, logging-effect, template-haskell
-     , wl-pprint-text
-     }:
-     mkDerivation {
-       pname = "logging-effect-extra-file";
        version = "1.1.2";
        sha256 = "1dxi4rq734zmjf2ljlh771ivr45i2cwz94vym3gw38ji4s0k8cym";
        isLibrary = true;
@@ -132167,7 +131632,6 @@ self: {
        homepage = "https://github.com/jship/logging-effect-extra#readme";
        description = "TH splices to augment log messages with file info";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "logging-effect-extra-handler" = callPackage
@@ -132176,25 +131640,6 @@ self: {
      }:
      mkDerivation {
        pname = "logging-effect-extra-handler";
-       version = "1.1.1";
-       sha256 = "1g73xyd1skh7paamnsia0x3cdayd34s12xvvxqaifm3wm19jy1rf";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base exceptions logging-effect time wl-pprint-text
-       ];
-       executableHaskellDepends = [ base logging-effect wl-pprint-text ];
-       homepage = "https://github.com/jship/logging-effect-extra#readme";
-       description = "Handy logging handler combinators";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "logging-effect-extra-handler_1_1_2" = callPackage
-    ({ mkDerivation, base, exceptions, logging-effect, time
-     , wl-pprint-text
-     }:
-     mkDerivation {
-       pname = "logging-effect-extra-handler";
        version = "1.1.2";
        sha256 = "1688vdlzyy8ikz2r96czyk0ganpv6h37x02sp930fmrj2qlwbvql";
        isLibrary = true;
@@ -132206,7 +131651,6 @@ self: {
        homepage = "https://github.com/jship/logging-effect-extra#readme";
        description = "Handy logging handler combinators";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "logging-facade" = callPackage
@@ -133689,6 +133133,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "lzma-conduit_1_2_1" = callPackage
+    ({ mkDerivation, base, base-compat, bytestring, conduit, HUnit
+     , lzma, QuickCheck, resourcet, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, transformers
+     }:
+     mkDerivation {
+       pname = "lzma-conduit";
+       version = "1.2.1";
+       sha256 = "0hm72da7xk9l3zxjh274yg444vf405djxqbkf3q3p2qhicmxlmg9";
+       libraryHaskellDepends = [
+         base bytestring conduit lzma resourcet transformers
+       ];
+       testHaskellDepends = [
+         base base-compat bytestring conduit HUnit QuickCheck resourcet
+         test-framework test-framework-hunit test-framework-quickcheck2
+       ];
+       homepage = "http://github.com/alphaHeavy/lzma-conduit";
+       description = "Conduit interface for lzma/xz compression";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lzma-enumerator" = callPackage
     ({ mkDerivation, base, bindings-DSL, bytestring, enumerator, HUnit
      , lzma, mtl, QuickCheck, test-framework, test-framework-hunit
@@ -133821,18 +133287,18 @@ self: {
      }) {};
 
   "machinecell" = callPackage
-    ({ mkDerivation, base, free, hspec, mtl, profunctors, QuickCheck
-     , semigroups, transformers
+    ({ mkDerivation, base, doctest, free, hspec, mtl, profunctors
+     , QuickCheck, semigroups, transformers
      }:
      mkDerivation {
        pname = "machinecell";
-       version = "3.3.2";
-       sha256 = "0gjzn4i9iwclgpki599g52dvsipzc3iplpr8pz4d2s85nm54c9b6";
+       version = "4.0.0";
+       sha256 = "1wwrgd1ag104kdx97vii3rh9lj9lg1vg04rr98ldi2ikb90jbgwb";
        libraryHaskellDepends = [
          base free mtl profunctors semigroups transformers
        ];
        testHaskellDepends = [
-         base hspec mtl profunctors QuickCheck semigroups
+         base doctest hspec mtl profunctors QuickCheck semigroups
        ];
        homepage = "http://github.com/as-capabl/machinecell";
        description = "Arrow based stream transducers";
@@ -135125,6 +134591,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "mapquest-api" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, exceptions, req, text }:
+     mkDerivation {
+       pname = "mapquest-api";
+       version = "0.2.0.0";
+       sha256 = "1x48lv6grbs34iv994yj2bhz3hi86lqa01vwx7bvxlbfn7jn3jqk";
+       libraryHaskellDepends = [
+         aeson base bytestring exceptions req text
+       ];
+       homepage = "https://github.com/ocramz/mapquest-api";
+       description = "Bindings to the MapQuest API";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "marionetta" = callPackage
     ({ mkDerivation, base, containers, gloss, mtl, splines, vector
      , vector-space
@@ -138259,30 +137739,6 @@ self: {
      }:
      mkDerivation {
        pname = "milena";
-       version = "0.5.2.0";
-       sha256 = "06gx1j9bxzxnagsymgr0nzhs1s6jsr14mhh2qx38h85n5g12zpvb";
-       libraryHaskellDepends = [
-         base bytestring cereal containers digest lens lifted-base
-         monad-control mtl murmur-hash network random resource-pool
-         semigroups transformers zlib
-       ];
-       testHaskellDepends = [
-         base bytestring lens mtl network QuickCheck semigroups tasty
-         tasty-hspec tasty-quickcheck
-       ];
-       homepage = "https://github.com/adamflott/milena.git#readme";
-       description = "A Kafka client for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "milena_0_5_2_1" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, containers, digest, lens
-     , lifted-base, monad-control, mtl, murmur-hash, network, QuickCheck
-     , random, resource-pool, semigroups, tasty, tasty-hspec
-     , tasty-quickcheck, transformers, zlib
-     }:
-     mkDerivation {
-       pname = "milena";
        version = "0.5.2.1";
        sha256 = "1mylkqp8vha9gq7li5cir5h3i27zb573alxgxnvr1y938z2nimf2";
        libraryHaskellDepends = [
@@ -138297,7 +137753,6 @@ self: {
        homepage = "https://github.com/adamflott/milena.git#readme";
        description = "A Kafka client for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mime" = callPackage
@@ -139065,7 +138520,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "mmark_0_0_5_4" = callPackage
+  "mmark_0_0_5_5" = callPackage
     ({ mkDerivation, aeson, base, case-insensitive, containers
      , criterion, data-default-class, deepseq, dlist, email-validate
      , foldl, hashable, hspec, hspec-megaparsec, html-entity-map, lucid
@@ -139075,8 +138530,8 @@ self: {
      }:
      mkDerivation {
        pname = "mmark";
-       version = "0.0.5.4";
-       sha256 = "0qzw37cj7481vpix8wfgv3ljv10jinfymjpcbzxi4m67fxxjmsf7";
+       version = "0.0.5.5";
+       sha256 = "1j1ci1zwnp7q6bnk1cqz5g2zx4c02yr8s87v9wf8j898bky8cgwj";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base case-insensitive containers data-default-class deepseq
@@ -140130,26 +139585,6 @@ self: {
      }:
      mkDerivation {
        pname = "monad-logger-prefix";
-       version = "0.1.6";
-       sha256 = "14jdx72wx6yavjjaaxx5p270vy5cdshynfbp5ss4mdi3h84rfxpv";
-       libraryHaskellDepends = [
-         base exceptions monad-control monad-logger mtl resourcet text
-         transformers transformers-base
-       ];
-       testHaskellDepends = [ base doctest Glob hspec QuickCheck ];
-       benchmarkHaskellDepends = [ base criterion monad-logger ];
-       homepage = "https://github.com/sellerlabs/monad-logger-prefix#readme";
-       description = "Add prefixes to your monad-logger output";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "monad-logger-prefix_0_1_7" = callPackage
-    ({ mkDerivation, base, criterion, doctest, exceptions, Glob, hspec
-     , monad-control, monad-logger, mtl, QuickCheck, resourcet, text
-     , transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "monad-logger-prefix";
        version = "0.1.7";
        sha256 = "0k8npx31vqck3zz1kirv36ljp6i9sy7banj0xkcpw8z7siqx64vd";
        libraryHaskellDepends = [
@@ -140161,7 +139596,6 @@ self: {
        homepage = "https://github.com/parsonsmatt/monad-logger-prefix#readme";
        description = "Add prefixes to your monad-logger output";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-logger-syslog" = callPackage
@@ -141128,8 +140562,8 @@ self: {
      }:
      mkDerivation {
        pname = "mongoDB";
-       version = "2.3.0.1";
-       sha256 = "1snr144yk05p5l9ck5gfs4zawg2l8fd8slmzxsrd29w2x6pk7iqv";
+       version = "2.3.0.2";
+       sha256 = "10gl9116hkjvm12ysgr1pi1vlk4d9jbkxgrcql6qhyvpsgv7s7bd";
        libraryHaskellDepends = [
          array base base16-bytestring base64-bytestring binary bson
          bytestring conduit conduit-extra containers cryptohash
@@ -141149,7 +140583,7 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
-  "mongoDB_2_3_0_2" = callPackage
+  "mongoDB_2_3_0_4" = callPackage
     ({ mkDerivation, array, base, base16-bytestring, base64-bytestring
      , binary, bson, bytestring, conduit, conduit-extra, containers
      , criterion, cryptohash, data-default-class, hashtables, hspec
@@ -141159,8 +140593,8 @@ self: {
      }:
      mkDerivation {
        pname = "mongoDB";
-       version = "2.3.0.2";
-       sha256 = "10gl9116hkjvm12ysgr1pi1vlk4d9jbkxgrcql6qhyvpsgv7s7bd";
+       version = "2.3.0.4";
+       sha256 = "0qxwk154wd2ir3z7qjn8b7p6lx34ga5r7gcpmf4yp1z8vzsbxn57";
        libraryHaskellDepends = [
          array base base16-bytestring base64-bytestring binary bson
          bytestring conduit conduit-extra containers cryptohash
@@ -141171,9 +140605,9 @@ self: {
        testHaskellDepends = [ base hspec mtl old-locale text time ];
        benchmarkHaskellDepends = [
          array base base16-bytestring base64-bytestring binary bson
-         bytestring containers criterion cryptohash hashtables lifted-base
-         monad-control mtl network nonce parsec random random-shuffle text
-         transformers-base
+         bytestring containers criterion cryptohash data-default-class
+         hashtables lifted-base monad-control mtl network nonce parsec
+         random random-shuffle text transformers-base
        ];
        homepage = "https://github.com/mongodb-haskell/mongodb";
        description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS";
@@ -142685,8 +142119,8 @@ self: {
     ({ mkDerivation, base, doctest }:
      mkDerivation {
        pname = "multi-instance";
-       version = "0.0.0.1";
-       sha256 = "09kqgh966z2n54mkrm1hbllfl8cws6s8caqlld1p8z502axmy5sk";
+       version = "0.0.0.2";
+       sha256 = "11r7wy143zy9drjrz7l57bdsbaj2fd3sjwbiz7pcmcdr1bxxga63";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
        homepage = "https://github.com/chris-martin/multi-instance#readme";
@@ -143579,26 +143013,6 @@ self: {
      }) {};
 
   "mutable-containers" = callPackage
-    ({ mkDerivation, base, containers, criterion, ghc-prim, hspec
-     , mono-traversable, primitive, QuickCheck, vector
-     }:
-     mkDerivation {
-       pname = "mutable-containers";
-       version = "0.3.3";
-       sha256 = "1svwa54prfdmhdlmv118lnkwv3jx3rx7v5x30wbdsy39n75kjyks";
-       libraryHaskellDepends = [
-         base containers ghc-prim mono-traversable primitive vector
-       ];
-       testHaskellDepends = [
-         base containers hspec primitive QuickCheck vector
-       ];
-       benchmarkHaskellDepends = [ base containers criterion ];
-       homepage = "https://github.com/snoyberg/mono-traversable";
-       description = "Abstactions and concrete implementations of mutable containers";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "mutable-containers_0_3_4" = callPackage
     ({ mkDerivation, base, containers, gauge, ghc-prim, hspec
      , mono-traversable, primitive, QuickCheck, vector
      }:
@@ -143616,7 +143030,6 @@ self: {
        homepage = "https://github.com/snoyberg/mono-traversable#readme";
        description = "Abstactions and concrete implementations of mutable containers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mutable-iter" = callPackage
@@ -143660,10 +143073,10 @@ self: {
     ({ mkDerivation, base, safe-exceptions }:
      mkDerivation {
        pname = "mvar-lock";
-       version = "0.1.0.0";
-       sha256 = "1j38hjj7nqz9f8qs0a2kvgh9v80l7ip16fm9qjl675hj479z668p";
+       version = "0.1.0.1";
+       sha256 = "0kdf7811kxwfj032d8g18za0nn9jlssh7dpvvr8kzjk01b77804r";
        libraryHaskellDepends = [ base safe-exceptions ];
-       homepage = "https://github.com/chris-martin/haskell-libraries";
+       homepage = "https://github.com/chris-martin/mvar-lock";
        description = "A trivial lock based on MVar";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -143831,6 +143244,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "mxnet-nn" = callPackage
+    ({ mkDerivation, attoparsec, attoparsec-binary, base, bytestring
+     , exceptions, ghc-prim, lens, mmorph, mtl, mxnet, resourcet
+     , streaming, streaming-bytestring, streaming-utils
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "mxnet-nn";
+       version = "0.0.1.1";
+       sha256 = "16clpl3sn4cf106hjigsyhgh15l9269yg838qarvbpigppkgb2sv";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base lens mtl mxnet resourcet unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         attoparsec attoparsec-binary base bytestring exceptions ghc-prim
+         mmorph mtl mxnet resourcet streaming streaming-bytestring
+         streaming-utils unordered-containers vector
+       ];
+       homepage = "http://github.com/pierric/mxnet-nn";
+       description = "Train a neural network with MXNet in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "mxnet-nnvm" = callPackage
     ({ mkDerivation, base, c2hs, c2hs-extra, mxnet }:
      mkDerivation {
@@ -144772,25 +144210,12 @@ self: {
     ({ mkDerivation }:
      mkDerivation {
        pname = "nats";
-       version = "1.1.1";
-       sha256 = "1kfl2yy97nb7q0j17v96rl73xvi3z4db9bk0xychc76dax41n78k";
-       doHaddock = false;
-       homepage = "http://github.com/ekmett/nats/";
-       description = "Natural numbers";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "nats_1_1_2" = callPackage
-    ({ mkDerivation }:
-     mkDerivation {
-       pname = "nats";
        version = "1.1.2";
        sha256 = "1v40drmhixck3pz3mdfghamh73l4rp71mzcviipv1y8jhrfxilmr";
        doHaddock = false;
        homepage = "http://github.com/ekmett/nats/";
        description = "Natural numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nats-queue" = callPackage
@@ -146057,20 +145482,6 @@ self: {
     ({ mkDerivation, base, bytestring, network, text, time, vector }:
      mkDerivation {
        pname = "network-carbon";
-       version = "1.0.10";
-       sha256 = "0fl6dxsarfrj0da3a1ajzisrnrgcjfwpag1997b0byvvkw47kspc";
-       libraryHaskellDepends = [
-         base bytestring network text time vector
-       ];
-       homepage = "http://github.com/ocharles/network-carbon";
-       description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "network-carbon_1_0_11" = callPackage
-    ({ mkDerivation, base, bytestring, network, text, time, vector }:
-     mkDerivation {
-       pname = "network-carbon";
        version = "1.0.11";
        sha256 = "1nkyj9114k2b6gwdd93yfrmf9zbziymbnbh3wxnz0vnk1hl2j5yq";
        libraryHaskellDepends = [
@@ -146079,7 +145490,6 @@ self: {
        homepage = "http://github.com/ocharles/network-carbon";
        description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-conduit" = callPackage
@@ -146364,6 +145774,8 @@ self: {
        pname = "network-msgpack-rpc";
        version = "0.0.4";
        sha256 = "0b9llxfgl2lcjlcz9ai6k6yhrlip6shd0wd56mfgbvv3lbd5n62r";
+       revision = "1";
+       editedCabalFile = "0v08258721mv2bih7h03ss0jvjx2b87kclvjn15xrksf93nbrbq2";
        libraryHaskellDepends = [
          base binary binary-conduit bytestring conduit conduit-extra
          data-default-class data-default-instances-base data-msgpack
@@ -147327,6 +146739,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "nirum" = callPackage
+    ({ mkDerivation, base, cmdargs, containers, directory, filepath
+     , hlint, hspec, hspec-core, hspec-meta, interpolatedstring-perl6
+     , megaparsec, mtl, process, semigroups, semver, temporary, text
+     }:
+     mkDerivation {
+       pname = "nirum";
+       version = "0.2.0";
+       sha256 = "1bn9sifnp4m7jd4ps27j1rniwb9v7wrycdb8mabimn7n7ir7hjkw";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base cmdargs containers directory filepath interpolatedstring-perl6
+         megaparsec mtl semver text
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base containers directory filepath hlint hspec hspec-core
+         hspec-meta interpolatedstring-perl6 megaparsec mtl process
+         semigroups semver temporary text
+       ];
+       homepage = "https://github.com/spoqa/nirum";
+       description = "IDL compiler and RPC/distributed object framework for microservices";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "nist-beacon" = callPackage
     ({ mkDerivation, base, bytestring, http-conduit, xml }:
      mkDerivation {
@@ -149073,21 +148511,21 @@ self: {
      }) {};
 
   "o-clock" = callPackage
-    ({ mkDerivation, base, deepseq, gauge, ghc-prim, hedgehog
-     , markdown-unlit, tasty, tasty-hedgehog, tasty-hspec, tiempo
-     , time-units, transformers, type-spec
+    ({ mkDerivation, base, deepseq, doctest, gauge, ghc-prim, Glob
+     , hedgehog, markdown-unlit, tasty, tasty-hedgehog, tasty-hspec
+     , tiempo, time-units, transformers, type-spec
      }:
      mkDerivation {
        pname = "o-clock";
-       version = "0.0.0";
-       sha256 = "0nswlj9anwmhl6vgw5gpdd924niiw15plwb46wwmzrv7jsmbaiyj";
+       version = "0.1.0";
+       sha256 = "18rqy00hkqqqbhmsgkhza9blm2fl6kb29fs78ifkr2hqsya17fh6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ghc-prim transformers ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
-         base hedgehog markdown-unlit tasty tasty-hedgehog tasty-hspec
-         type-spec
+         base doctest Glob hedgehog markdown-unlit tasty tasty-hedgehog
+         tasty-hspec type-spec
        ];
        benchmarkHaskellDepends = [ base deepseq gauge tiempo time-units ];
        homepage = "https://github.com/serokell/o-clock";
@@ -149951,23 +149389,6 @@ self: {
      }) {};
 
   "online" = callPackage
-    ({ mkDerivation, base, foldl, numhask, protolude, tdigest, vector
-     , vector-algorithms
-     }:
-     mkDerivation {
-       pname = "online";
-       version = "0.2.0";
-       sha256 = "13vg34h09ds49r5j6dg8kqh90iqhbadr6jv57y0766h1pmr5i8kh";
-       libraryHaskellDepends = [
-         base foldl numhask protolude tdigest vector vector-algorithms
-       ];
-       homepage = "https://github.com/tonyday567/online";
-       description = "online statistics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "online_0_2_1_0" = callPackage
     ({ mkDerivation, base, doctest, foldl, formatting, numhask
      , optparse-generic, perf, protolude, scientific, tasty, tdigest
      , text, vector, vector-algorithms
@@ -153829,25 +153250,6 @@ self: {
      }:
      mkDerivation {
        pname = "parsec";
-       version = "3.1.11";
-       sha256 = "0vk7q9j2128q191zf1sg0ylj9s9djwayqk9747k0a5fin4f2b1vg";
-       revision = "1";
-       editedCabalFile = "0prqjj2gxlwh2qhpcck5k6cgk4har9xqxc67yzjqd44mr2xgl7ir";
-       libraryHaskellDepends = [ base bytestring mtl text ];
-       testHaskellDepends = [
-         base HUnit test-framework test-framework-hunit
-       ];
-       homepage = "https://github.com/aslatter/parsec";
-       description = "Monadic parser combinators";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "parsec_3_1_13_0" = callPackage
-    ({ mkDerivation, base, bytestring, HUnit, mtl, test-framework
-     , test-framework-hunit, text
-     }:
-     mkDerivation {
-       pname = "parsec";
        version = "3.1.13.0";
        sha256 = "1wc09pyn70p8z6llink10c8pqbh6ikyk554911yfwxv1g91swqbq";
        libraryHaskellDepends = [ base bytestring mtl text ];
@@ -153857,7 +153259,6 @@ self: {
        homepage = "https://github.com/hvr/parsec";
        description = "Monadic parser combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parsec-extra" = callPackage
@@ -154256,6 +153657,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "partial-handler_1_0_3" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "partial-handler";
+       version = "1.0.3";
+       sha256 = "0cf1748zyr07zv0ffi44rf5b9f7ygdybbdcl7m7c0zj14kq2miwl";
+       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 {
@@ -156578,30 +155992,6 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-template";
-       version = "2.5.3";
-       sha256 = "1b8n99l2dh4ng1pf86541q5s2is30scnsx3p3vzh0kif9myrk5cy";
-       libraryHaskellDepends = [
-         aeson aeson-compat base bytestring containers ghc-prim
-         http-api-data monad-control monad-logger path-pieces persistent
-         tagged template-haskell text transformers unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson base bytestring hspec persistent QuickCheck text transformers
-       ];
-       homepage = "http://www.yesodweb.com/book/persistent";
-       description = "Type-safe, non-relational, multi-backend persistence";
-       license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ psibi ];
-     }) {};
-
-  "persistent-template_2_5_3_1" = callPackage
-    ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers
-     , ghc-prim, hspec, http-api-data, monad-control, monad-logger
-     , path-pieces, persistent, QuickCheck, tagged, template-haskell
-     , text, transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "persistent-template";
        version = "2.5.3.1";
        sha256 = "0449piw3n02q7dag7k1pakfmzmf3ms4wk1qmnagczpm1ckajinwd";
        libraryHaskellDepends = [
@@ -156615,7 +156005,6 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Type-safe, non-relational, multi-backend persistence";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
@@ -157158,20 +156547,22 @@ self: {
 
   "phoityne-vscode" = callPackage
     ({ mkDerivation, aeson, base, bytestring, Cabal, cmdargs, conduit
-     , conduit-extra, ConfigFile, containers, directory, filepath
-     , fsnotify, hslogger, MissingH, mtl, parsec, process, resourcet
-     , safe, split, text, transformers
+     , conduit-extra, ConfigFile, containers, data-default, directory
+     , filepath, fsnotify, hslogger, lens, MissingH, mtl, parsec
+     , process, resourcet, safe, safe-exceptions, split, text
+     , transformers
      }:
      mkDerivation {
        pname = "phoityne-vscode";
-       version = "0.0.20.0";
-       sha256 = "1k9vh2xyk2nwck1g86lxvbrab7ap5p8p9vhh7pj98a56wkvxmv7y";
+       version = "0.0.21.0";
+       sha256 = "190gqa5zi99a9rrazbcg2xmzx5bl304vb95w8z4qilggngq1y7df";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          aeson base bytestring Cabal cmdargs conduit conduit-extra
-         ConfigFile containers directory filepath fsnotify hslogger MissingH
-         mtl parsec process resourcet safe split text transformers
+         ConfigFile containers data-default directory filepath fsnotify
+         hslogger lens MissingH mtl parsec process resourcet safe
+         safe-exceptions split text transformers
        ];
        homepage = "https://github.com/phoityne/phoityne-vscode";
        description = "Haskell Debug Adapter for Visual Studio Code";
@@ -158091,20 +157482,6 @@ self: {
     ({ mkDerivation, async, base, contravariant, pipes, stm, void }:
      mkDerivation {
        pname = "pipes-concurrency";
-       version = "2.0.8";
-       sha256 = "0ak6vnjl12q4615waifbpdxbm96yz5yzqzwjj1zwvvb2jfk5snwz";
-       libraryHaskellDepends = [
-         async base contravariant pipes stm void
-       ];
-       testHaskellDepends = [ async base pipes stm ];
-       description = "Concurrency for the pipes ecosystem";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pipes-concurrency_2_0_9" = callPackage
-    ({ mkDerivation, async, base, contravariant, pipes, stm, void }:
-     mkDerivation {
-       pname = "pipes-concurrency";
        version = "2.0.9";
        sha256 = "1br0cssp4rdfh6lhvjql9ppjvcn0v6kpg1h1f1hi8vqb0c87nvb4";
        libraryHaskellDepends = [
@@ -158113,7 +157490,6 @@ self: {
        testHaskellDepends = [ async base pipes stm ];
        description = "Concurrency for the pipes ecosystem";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-conduit" = callPackage
@@ -161583,8 +160959,8 @@ self: {
      }:
      mkDerivation {
        pname = "potoki";
-       version = "0.7";
-       sha256 = "009f36bc3l7xilih5y7hzibvdyxa36s8y9r255y74jgkfy583w4c";
+       version = "0.7.2";
+       sha256 = "10yl08hcfgn0l15hr6n5ga91cla050lys7jyj4w0j3s3c9k2w3gd";
        libraryHaskellDepends = [
          attoparsec base base-prelude bytestring directory foldl hashable
          potoki-core profunctors text unagi-chan unordered-containers vector
@@ -161828,6 +161204,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pqueue_1_4_1_1" = callPackage
+    ({ mkDerivation, base, deepseq, QuickCheck }:
+     mkDerivation {
+       pname = "pqueue";
+       version = "1.4.1.1";
+       sha256 = "1zvwm1zcqqq5n101s1brjhgbay8rf9fviq6gxbplf40i63m57p1x";
+       libraryHaskellDepends = [ base deepseq ];
+       testHaskellDepends = [ base deepseq QuickCheck ];
+       description = "Reliable, persistent, fast priority queues";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pqueue-mtl" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, MaybeT, mtl
      , stateful-mtl, uvector
@@ -163107,10 +162496,8 @@ self: {
      }:
      mkDerivation {
        pname = "probable";
-       version = "0.1.2";
-       sha256 = "0lypxz3lz4gj5x98k7mwg3xagjld0qhzrxdk8l4gjxj77m00hkfz";
-       revision = "1";
-       editedCabalFile = "1iwv4ygfm53q3jyiiniqhsixps549h9c2apif10pjg5jib04yv85";
+       version = "0.1.3";
+       sha256 = "196m3v30818q034x7jdnqdwfqffx5pfj64yyw0q2blhwzkhc0f9n";
        libraryHaskellDepends = [
          base mtl mwc-random primitive statistics transformers vector
        ];
@@ -163197,24 +162584,6 @@ self: {
      }:
      mkDerivation {
        pname = "process-extras";
-       version = "0.7.3";
-       sha256 = "0hyrqz2dinvql6r9ldd2q35zkavjwqadw13zqzcwrdhq8myhawzb";
-       libraryHaskellDepends = [
-         base bytestring data-default deepseq generic-deriving ListLike mtl
-         process text
-       ];
-       testHaskellDepends = [ base HUnit ];
-       homepage = "https://github.com/seereason/process-extras";
-       description = "Process extras";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "process-extras_0_7_4" = callPackage
-    ({ mkDerivation, base, bytestring, data-default, deepseq
-     , generic-deriving, HUnit, ListLike, mtl, process, text
-     }:
-     mkDerivation {
-       pname = "process-extras";
        version = "0.7.4";
        sha256 = "0klqgr37f1z2z6i0a9b0giapmq0p35l5k9kz1p7f0k1597w7agi9";
        libraryHaskellDepends = [
@@ -163225,7 +162594,6 @@ self: {
        homepage = "https://github.com/seereason/process-extras";
        description = "Process extras";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "process-iterio" = callPackage
@@ -164438,6 +163806,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "protocol-buffers_2_4_7" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, containers
+     , directory, filepath, mtl, parsec, syb, utf8-string
+     }:
+     mkDerivation {
+       pname = "protocol-buffers";
+       version = "2.4.7";
+       sha256 = "1db2r961qmrcvcqs53imjw16cawn7hjcicxhygszk0mg538v7rh9";
+       libraryHaskellDepends = [
+         array base binary bytestring containers directory filepath mtl
+         parsec syb utf8-string
+       ];
+       homepage = "https://github.com/k-bx/protocol-buffers";
+       description = "Parse Google Protocol Buffer specifications";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "protocol-buffers-descriptor" = callPackage
     ({ mkDerivation, base, bytestring, containers, protocol-buffers }:
      mkDerivation {
@@ -164453,6 +163839,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "protocol-buffers-descriptor_2_4_7" = callPackage
+    ({ mkDerivation, base, bytestring, containers, protocol-buffers }:
+     mkDerivation {
+       pname = "protocol-buffers-descriptor";
+       version = "2.4.7";
+       sha256 = "1k11bgwg2345y4a7ib6h3410y6088whlxc6s9iy0whpbkhwi7lq0";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base bytestring containers protocol-buffers
+       ];
+       homepage = "https://github.com/k-bx/protocol-buffers";
+       description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "protocol-buffers-descriptor-fork" = callPackage
     ({ mkDerivation, base, bytestring, containers
      , protocol-buffers-fork
@@ -164689,6 +164091,8 @@ self: {
        pname = "pseudo-boolean";
        version = "0.1.6.0";
        sha256 = "1v28vbhcrx0mvciazlanwyaxwav0gfjc7sxz7adgims7mj64g1ra";
+       revision = "1";
+       editedCabalFile = "11n7wcfpahbyg8lmq90vvq11fm2ls4761qf9q7pkbvd7vkm6by2n";
        libraryHaskellDepends = [
          attoparsec base bytestring bytestring-builder containers deepseq
          dlist hashable megaparsec parsec void
@@ -165540,8 +164944,8 @@ self: {
      }:
      mkDerivation {
        pname = "pushbullet-types";
-       version = "0.4.0.0";
-       sha256 = "0fds6lhkmyfs8hrnaq29fbglcmampa4n8j93x1jkynxbp1in66z6";
+       version = "0.4.0.2";
+       sha256 = "0r6cg0g98b7zzf4sjl4mrpnwmffhz2dnba9bgjw3943xf06afnn1";
        libraryHaskellDepends = [
          aeson base http-api-data microlens microlens-th scientific text
          time unordered-containers
@@ -165577,32 +164981,6 @@ self: {
      }:
      mkDerivation {
        pname = "pusher-http-haskell";
-       version = "1.5.1.0";
-       sha256 = "1mnigsf10jxqsvjr1vbizxjrf97w3cx54xy850mj3b8i34929bmh";
-       libraryHaskellDepends = [
-         aeson base base16-bytestring bytestring cryptonite hashable
-         http-client http-types memory text time transformers
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base base16-bytestring bytestring cryptonite hspec
-         http-client http-types QuickCheck scientific text time transformers
-         unordered-containers vector
-       ];
-       homepage = "https://github.com/pusher-community/pusher-http-haskell";
-       description = "Haskell client library for the Pusher HTTP API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "pusher-http-haskell_1_5_1_2" = callPackage
-    ({ mkDerivation, aeson, base, base16-bytestring, bytestring
-     , cryptonite, hashable, hspec, http-client, http-types, memory
-     , QuickCheck, scientific, text, time, transformers
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "pusher-http-haskell";
        version = "1.5.1.2";
        sha256 = "1jrb0ni157a9wa5mbqz1dmd1i7nkjh1nhjyvx52mbk530hslcnnn";
        libraryHaskellDepends = [
@@ -166747,23 +166125,6 @@ self: {
      }:
      mkDerivation {
        pname = "quickcheck-classes";
-       version = "0.3.1";
-       sha256 = "0xcjm55aprds4x1jlrj3izgwxpqv8z19sbiqfn8lvx6b8yc61f7f";
-       libraryHaskellDepends = [
-         aeson base prim-array primitive QuickCheck transformers
-       ];
-       testHaskellDepends = [ aeson base primitive QuickCheck vector ];
-       homepage = "https://github.com/andrewthad/quickcheck-classes#readme";
-       description = "QuickCheck common typeclasses";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "quickcheck-classes_0_3_2" = callPackage
-    ({ mkDerivation, aeson, base, prim-array, primitive, QuickCheck
-     , transformers, vector
-     }:
-     mkDerivation {
-       pname = "quickcheck-classes";
        version = "0.3.2";
        sha256 = "10z65dxm0jply0zbx1kpxpiir3z85c9133hkiqnra6sqz13njdz4";
        libraryHaskellDepends = [
@@ -166773,7 +166134,6 @@ self: {
        homepage = "https://github.com/andrewthad/quickcheck-classes#readme";
        description = "QuickCheck common typeclasses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickcheck-combinators" = callPackage
@@ -168404,8 +167764,8 @@ self: {
     ({ mkDerivation, async, base, containers, foreign-store, stm }:
      mkDerivation {
        pname = "rapid";
-       version = "0.1.3";
-       sha256 = "0n4py9ndri6xy3n2rkr78f0y146didxg3625nhm72jsqcd1qjfhn";
+       version = "0.1.4";
+       sha256 = "0f86j4r3sm74w49v9x9s58wahgcgick6z7awl6piq83iqaiy4sh7";
        libraryHaskellDepends = [
          async base containers foreign-store stm
        ];
@@ -173667,26 +173027,6 @@ self: {
 
   "retry" = callPackage
     ({ mkDerivation, base, data-default-class, exceptions, ghc-prim
-     , hspec, HUnit, mtl, QuickCheck, random, stm, time, transformers
-     }:
-     mkDerivation {
-       pname = "retry";
-       version = "0.7.5.1";
-       sha256 = "116fjfxdyqrk3079hqcil0dv7r2fw6x64pjwfxhckpxqavxza7sk";
-       libraryHaskellDepends = [
-         base data-default-class exceptions ghc-prim random transformers
-       ];
-       testHaskellDepends = [
-         base data-default-class exceptions ghc-prim hspec HUnit mtl
-         QuickCheck random stm time transformers
-       ];
-       homepage = "http://github.com/Soostone/retry";
-       description = "Retry combinators for monadic actions that may fail";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "retry_0_7_6_0" = callPackage
-    ({ mkDerivation, base, data-default-class, exceptions, ghc-prim
      , hedgehog, HUnit, mtl, random, stm, tasty, tasty-hedgehog
      , tasty-hunit, time, transformers
      }:
@@ -173704,7 +173044,6 @@ self: {
        homepage = "http://github.com/Soostone/retry";
        description = "Retry combinators for monadic actions that may fail";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "retryer" = callPackage
@@ -173870,29 +173209,31 @@ self: {
      }) {};
 
   "rfc" = callPackage
-    ({ mkDerivation, aeson, aeson-diff, async, base, bifunctors, binary
-     , blaze-html, classy-prelude, containers, data-default, exceptions
-     , hedis, http-api-data, http-client, http-client-tls, http-types
-     , lens, lifted-async, lifted-base, markdown, monad-control
-     , postgresql-simple, resource-pool, servant, servant-blaze
-     , servant-client, servant-docs, servant-server, servant-swagger
-     , simple-logger, string-conversions, swagger2, temporary, text
-     , time-units, unordered-containers, url, uuid-types, vector, wai
-     , wai-cors, wai-extra, wreq
+    ({ mkDerivation, aeson, aeson-diff, base, bifunctors, binary
+     , blaze-html, classy-prelude, containers, data-default
+     , freer-simple, hedis, http-api-data, http-client, http-client-tls
+     , http-types, lens, lifted-async, markdown, monad-control
+     , natural-transformation, postgresql-simple, resource-pool, servant
+     , servant-blaze, servant-client, servant-docs, servant-server
+     , servant-swagger, simple-logger, string-conversions, swagger2
+     , temporary, text, time-units, unliftio, unliftio-core
+     , unordered-containers, url, uuid-types, vector, wai, wai-cors
+     , wai-extra, wreq
      }:
      mkDerivation {
        pname = "rfc";
-       version = "0.0.0.20";
-       sha256 = "0b54v1mw76w3ljs64jrvz5z24008z4dkmg31i1spfrakypx7fxn5";
+       version = "0.0.0.21";
+       sha256 = "1s3ni2gsvhxrxhmyahc22frrh4flzvwrnv33car14wv1jldbywfi";
        libraryHaskellDepends = [
-         aeson aeson-diff async base bifunctors binary blaze-html
-         classy-prelude containers data-default exceptions hedis
-         http-api-data http-client http-client-tls http-types lens
-         lifted-async lifted-base markdown monad-control postgresql-simple
+         aeson aeson-diff base bifunctors binary blaze-html classy-prelude
+         containers data-default freer-simple hedis http-api-data
+         http-client http-client-tls http-types lens lifted-async markdown
+         monad-control natural-transformation postgresql-simple
          resource-pool servant servant-blaze servant-client servant-docs
          servant-server servant-swagger simple-logger string-conversions
-         swagger2 temporary text time-units unordered-containers url
-         uuid-types vector wai wai-cors wai-extra wreq
+         swagger2 temporary text time-units unliftio unliftio-core
+         unordered-containers url uuid-types vector wai wai-cors wai-extra
+         wreq
        ];
        homepage = "https://github.com/RobertFischer/rfc#README.md";
        description = "Robert Fischer's Common library";
@@ -174931,6 +174272,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "rope-utf16-splay" = callPackage
+    ({ mkDerivation, base, QuickCheck, tasty, tasty-hunit
+     , tasty-quickcheck, text
+     }:
+     mkDerivation {
+       pname = "rope-utf16-splay";
+       version = "0.2.0.0";
+       sha256 = "078hkv21maydvks57pz6z3qyz0r4s1c6ypdmlr4xlmakyldrdlc3";
+       libraryHaskellDepends = [ base text ];
+       testHaskellDepends = [
+         base QuickCheck tasty tasty-hunit tasty-quickcheck text
+       ];
+       homepage = "https://github.com/ollef/rope-utf16-splay";
+       description = "Ropes optimised for updating using UTF-16 code units and row/column pairs";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "rosa" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, lens
      , namecoin-update, optparse-applicative, text, unordered-containers
@@ -175284,6 +174642,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "row-types" = callPackage
+    ({ mkDerivation, base, criterion, deepseq, hashable, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "row-types";
+       version = "0.2.0.0";
+       sha256 = "158k4q6b1ca7d8fkznl09mdd29z7w5clxh48i3b3m1bcmhjmcfmh";
+       libraryHaskellDepends = [
+         base deepseq hashable text unordered-containers
+       ];
+       benchmarkHaskellDepends = [ base criterion deepseq ];
+       description = "Open Records and Variants";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "rowrecord" = callPackage
     ({ mkDerivation, base, containers, template-haskell }:
      mkDerivation {
@@ -178016,8 +177390,8 @@ self: {
      }:
      mkDerivation {
        pname = "scotty-resource";
-       version = "0.2.0.0";
-       sha256 = "0210zl0ad80scjcl1dlz5z55g2rf0ybr7vj2qdl83niri8511794";
+       version = "0.2.0.1";
+       sha256 = "0y39sxvin9ljwk2jxnb18wr79d0ap9363vr2mh8xbc4llq0yjavj";
        libraryHaskellDepends = [
          base containers http-types scotty text transformers wai
        ];
@@ -179195,25 +178569,12 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "semigroups";
-       version = "0.18.3";
-       sha256 = "1jm9wnb5jmwdk4i9qbwfay69ydi76xi0qqi9zqp6wh3jd2c7qa9m";
-       libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/ekmett/semigroups/";
-       description = "Anything that associates";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "semigroups_0_18_4" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "semigroups";
        version = "0.18.4";
        sha256 = "09sxd17h1kcjsjaf1am2nwpb4vaq8d0q718fbkxwysws691317jq";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/ekmett/semigroups/";
        description = "Anything that associates";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "semigroups-actions" = callPackage
@@ -179425,27 +178786,6 @@ self: {
      }:
      mkDerivation {
        pname = "sensu-run";
-       version = "0.4.0.3";
-       sha256 = "05gl6dannlfx49f24lhspyygq8j37wmsyp8nrlcpcsqbrbd3k82g";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         aeson base bytestring filepath http-client http-types lens network
-         optparse-applicative process temporary text time unix unix-compat
-         vector wreq
-       ];
-       homepage = "https://github.com/maoe/sensu-run#readme";
-       description = "A tool to send command execution results to Sensu";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "sensu-run_0_4_0_4" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, filepath, http-client
-     , http-types, lens, network, optparse-applicative, process
-     , temporary, text, time, unix, unix-compat, vector, wreq
-     }:
-     mkDerivation {
-       pname = "sensu-run";
        version = "0.4.0.4";
        sha256 = "1pgzfa6ns67fq5cx7qizwjfb2gw6awx012iwhskx8s4wg9snbq5y";
        isLibrary = false;
@@ -179458,7 +178798,6 @@ self: {
        homepage = "https://github.com/maoe/sensu-run#readme";
        description = "A tool to send command execution results to Sensu";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sentence-jp" = callPackage
@@ -181402,8 +180741,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-pushbullet-client";
-       version = "0.4.0.0";
-       sha256 = "0v2mkriwh7lara66w02kkzwlnr5y8ahb6djpsnhvch1asa5klsnk";
+       version = "0.5.0.0";
+       sha256 = "1pdqb2kff033zga35n9ycgnw3zb42b5hpap3f4fjkxfbxz5cq3zz";
        libraryHaskellDepends = [
          aeson base http-api-data http-client http-client-tls microlens
          microlens-th pushbullet-types scientific servant servant-client
@@ -181555,6 +180894,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "servant-ruby_0_6_0_0" = callPackage
+    ({ mkDerivation, base, casing, doctest, lens, QuickCheck
+     , servant-foreign, text
+     }:
+     mkDerivation {
+       pname = "servant-ruby";
+       version = "0.6.0.0";
+       sha256 = "0cm0s44x71vbfzl5ky7s1ml88gnympr4n0lfg6w0z17lr95myrm8";
+       libraryHaskellDepends = [ base casing lens servant-foreign text ];
+       testHaskellDepends = [ base doctest QuickCheck ];
+       homepage = "https://github.com/joneshf/servant-ruby#readme";
+       description = "Generate a Ruby client from a Servant API with Net::HTTP";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-scotty" = callPackage
     ({ mkDerivation, aeson, base, http-types, scotty, servant
      , servant-response, text, transformers
@@ -181852,6 +181207,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-swagger-ui_0_2_5_3_9_1" = callPackage
+    ({ mkDerivation, aeson, base, base-compat, blaze-markup, bytestring
+     , directory, file-embed, filepath, http-media, lens, servant
+     , servant-blaze, servant-server, servant-swagger, swagger2
+     , template-haskell, text, transformers, transformers-compat, wai
+     , wai-app-static, warp
+     }:
+     mkDerivation {
+       pname = "servant-swagger-ui";
+       version = "0.2.5.3.9.1";
+       sha256 = "1fbznhlzh9xnnhxsazan46w5x439a31lglb8mh7j945axyh7l09m";
+       libraryHaskellDepends = [
+         base blaze-markup bytestring directory file-embed filepath
+         http-media servant servant-blaze servant-server servant-swagger
+         swagger2 template-haskell text transformers transformers-compat
+         wai-app-static
+       ];
+       testHaskellDepends = [
+         aeson base base-compat lens servant servant-server servant-swagger
+         swagger2 text transformers transformers-compat wai warp
+       ];
+       homepage = "https://github.com/phadej/servant-swagger-ui#readme";
+       description = "Servant swagger ui";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-websockets" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, conduit
      , exceptions, resourcet, servant-server, text, wai, wai-websockets
@@ -182927,17 +182309,51 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "shake_0_16_1" = callPackage
+    ({ mkDerivation, base, binary, bytestring, deepseq, directory
+     , extra, filepath, hashable, js-flot, js-jquery, primitive, process
+     , QuickCheck, random, time, transformers, unix
+     , unordered-containers, utf8-string
+     }:
+     mkDerivation {
+       pname = "shake";
+       version = "0.16.1";
+       sha256 = "14f9ai58i83wy5kr28gl1a3a1jbl89j6i25qi79nf3fbdca05s75";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base binary bytestring deepseq directory extra filepath hashable
+         js-flot js-jquery primitive process random time transformers unix
+         unordered-containers utf8-string
+       ];
+       executableHaskellDepends = [
+         base binary bytestring deepseq directory extra filepath hashable
+         js-flot js-jquery primitive process random time transformers unix
+         unordered-containers utf8-string
+       ];
+       testHaskellDepends = [
+         base binary bytestring deepseq directory extra filepath hashable
+         js-flot js-jquery primitive process QuickCheck random time
+         transformers unix unordered-containers utf8-string
+       ];
+       homepage = "http://shakebuild.com";
+       description = "Build system library, like Make, but more accurate dependencies";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "shake-ats" = callPackage
     ({ mkDerivation, base, binary, dependency, directory, hs2ats
-     , language-ats, shake, shake-ext, text
+     , language-ats, microlens, shake, shake-ext, text
      }:
      mkDerivation {
        pname = "shake-ats";
-       version = "1.3.0.7";
-       sha256 = "1syvc551f6dj9xf0n8yhadvw0chnzbn7j62hi2nd3wxibi3w0hdv";
+       version = "1.4.0.0";
+       sha256 = "06x8aclhhsr6gg1qj9hbv8bk4f21i55akni7i3fl117qn2bq8wp6";
        libraryHaskellDepends = [
-         base binary dependency directory hs2ats language-ats shake
-         shake-ext text
+         base binary dependency directory hs2ats language-ats microlens
+         shake shake-ext text
        ];
        homepage = "https://github.com/vmchale/shake-ats#readme";
        description = "Utilities for building ATS projects with shake";
@@ -183133,32 +182549,6 @@ self: {
      }:
      mkDerivation {
        pname = "shakespeare";
-       version = "2.0.14.1";
-       sha256 = "02pahbvibll4jmbq6p5vxr2r4mmrfx3h0c8v6qbj4rlq96lc6a23";
-       libraryHaskellDepends = [
-         aeson base blaze-html blaze-markup bytestring containers directory
-         exceptions ghc-prim parsec process scientific template-haskell text
-         time transformers unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base blaze-html blaze-markup bytestring containers directory
-         exceptions ghc-prim hspec HUnit parsec process template-haskell
-         text time transformers
-       ];
-       homepage = "http://www.yesodweb.com/book/shakespearean-templates";
-       description = "A toolkit for making compile-time interpolated templates";
-       license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ psibi ];
-     }) {};
-
-  "shakespeare_2_0_15" = callPackage
-    ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
-     , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec
-     , process, scientific, template-haskell, text, time, transformers
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "shakespeare";
        version = "2.0.15";
        sha256 = "1vk4b19zvwy4mpwaq9z3l3kfmz75gfyf7alhh0y112gspgpccm23";
        libraryHaskellDepends = [
@@ -183174,7 +182564,6 @@ self: {
        homepage = "http://www.yesodweb.com/book/shakespearean-templates";
        description = "A toolkit for making compile-time interpolated templates";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
@@ -184806,23 +184195,6 @@ self: {
      }:
      mkDerivation {
        pname = "simple-sendfile";
-       version = "0.2.26";
-       sha256 = "0z2r971bjy9wwv9rhnzh0ldd0z9zvqwyrq9yhz7m4lnf0k0wqq6z";
-       libraryHaskellDepends = [ base bytestring network unix ];
-       testHaskellDepends = [
-         base bytestring conduit conduit-extra directory hspec HUnit network
-         process resourcet unix
-       ];
-       description = "Cross platform library for the sendfile system call";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "simple-sendfile_0_2_27" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, conduit-extra
-     , directory, hspec, HUnit, network, process, resourcet, unix
-     }:
-     mkDerivation {
-       pname = "simple-sendfile";
        version = "0.2.27";
        sha256 = "1bwwqzcm56m2w4ymsa054sxmpbj76h9pvb0jf8zxp8lr41cp51gn";
        libraryHaskellDepends = [ base bytestring network unix ];
@@ -184832,7 +184204,6 @@ self: {
        ];
        description = "Cross platform library for the sendfile system call";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-server" = callPackage
@@ -186762,8 +186133,8 @@ self: {
        pname = "snap";
        version = "1.1.0.0";
        sha256 = "166ilpc4dd4020mmqn2lrfs3j5dl4a2mvqag1sz4mx7jcndrjbc8";
-       revision = "1";
-       editedCabalFile = "1a51516zn0315f9y9wyzbj2fka2c7krrrd04nhzrqbfaa8smim71";
+       revision = "2";
+       editedCabalFile = "05k5fgb31xvz733j3d4hqbhzbjlglv1m4f020mdnm1q7qg4a81nq";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring cereal clientsession configurator
          containers directory directory-tree dlist filepath hashable heist
@@ -192323,26 +191694,12 @@ self: {
     ({ mkDerivation, array, base }:
      mkDerivation {
        pname = "stm";
-       version = "2.4.4.1";
-       sha256 = "111kpy1d6f5c0bggh6hyfm86q5p8bq1qbqf6dw2x4l4dxnar16cg";
-       revision = "1";
-       editedCabalFile = "0kzw4rw9fgmc4qyxmm1lwifdyrx5r1356150xm14vy4mp86diks9";
-       libraryHaskellDepends = [ array base ];
-       description = "Software Transactional Memory";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "stm_2_4_5_0" = callPackage
-    ({ mkDerivation, array, base }:
-     mkDerivation {
-       pname = "stm";
        version = "2.4.5.0";
        sha256 = "19sr11a0hqikhvf561b38phz6k3zg9s157a0f5ffvghk7wcdpmri";
        libraryHaskellDepends = [ array base ];
        homepage = "https://wiki.haskell.org/Software_transactional_memory";
        description = "Software Transactional Memory";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stm-channelize" = callPackage
@@ -192979,28 +192336,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "stratosphere_0_15_1" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, hashable
-     , hspec, hspec-discover, lens, template-haskell, text
+  "stratosphere_0_15_2" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
+     , hashable, hspec, hspec-discover, lens, template-haskell, text
      , unordered-containers
      }:
      mkDerivation {
        pname = "stratosphere";
-       version = "0.15.1";
-       sha256 = "13221ynzcaj6hilvbcllnjf1ixv6zmsp7jnhp1ishmj42z5qarbl";
+       version = "0.15.2";
+       sha256 = "00mna9w4021a1ydxyysx0wd333hby4sx3fpl1vygmcyjfibwiqmc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson aeson-pretty base bytestring hashable lens template-haskell
-         text unordered-containers
+         aeson aeson-pretty base bytestring containers hashable lens
+         template-haskell text unordered-containers
        ];
        executableHaskellDepends = [
-         aeson aeson-pretty base bytestring hashable lens template-haskell
-         text unordered-containers
+         aeson aeson-pretty base bytestring containers hashable lens
+         template-haskell text unordered-containers
        ];
        testHaskellDepends = [
-         aeson aeson-pretty base bytestring hashable hspec hspec-discover
-         lens template-haskell text unordered-containers
+         aeson aeson-pretty base bytestring containers hashable hspec
+         hspec-discover lens template-haskell text unordered-containers
        ];
        homepage = "https://github.com/frontrowed/stratosphere#readme";
        description = "EDSL for AWS CloudFormation";
@@ -193266,31 +192623,6 @@ self: {
 
   "streaming-commons" = callPackage
     ({ mkDerivation, array, async, base, blaze-builder, bytestring
-     , criterion, deepseq, directory, hspec, network, process
-     , QuickCheck, random, stm, text, transformers, unix, zlib
-     }:
-     mkDerivation {
-       pname = "streaming-commons";
-       version = "0.1.18";
-       sha256 = "1jw3y3clh2l0kmsrkhhn6n1b8i8gnwz5cwbczj1kq00sj3xjxbr7";
-       libraryHaskellDepends = [
-         array async base blaze-builder bytestring directory network process
-         random stm text transformers unix zlib
-       ];
-       testHaskellDepends = [
-         array async base blaze-builder bytestring deepseq hspec network
-         QuickCheck text unix zlib
-       ];
-       benchmarkHaskellDepends = [
-         base blaze-builder bytestring criterion deepseq text
-       ];
-       homepage = "https://github.com/fpco/streaming-commons";
-       description = "Common lower-level functions needed by various streaming data libraries";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "streaming-commons_0_1_19" = callPackage
-    ({ mkDerivation, array, async, base, blaze-builder, bytestring
      , deepseq, directory, gauge, hspec, network, process, QuickCheck
      , random, stm, text, transformers, unix, zlib
      }:
@@ -193312,7 +192644,6 @@ self: {
        homepage = "https://github.com/fpco/streaming-commons";
        description = "Common lower-level functions needed by various streaming data libraries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "streaming-concurrency" = callPackage
@@ -193342,8 +192673,8 @@ self: {
      }:
      mkDerivation {
        pname = "streaming-conduit";
-       version = "0.1.2.1";
-       sha256 = "053p9xzd48y47mx22r4v468lbjrbi5gzqwzarfpzf0j5gis3bm38";
+       version = "0.1.2.2";
+       sha256 = "0g2x8a6gksc1na3qn1fnd9c7cckn4r54x11x4rxnmy2v04sv0h8z";
        libraryHaskellDepends = [
          base bytestring conduit streaming streaming-bytestring transformers
        ];
@@ -193662,14 +192993,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "strict-base-types_0_6_0" = callPackage
+  "strict-base-types_0_6_1" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, binary, deepseq, ghc-prim
      , hashable, lens, QuickCheck, strict
      }:
      mkDerivation {
        pname = "strict-base-types";
-       version = "0.6.0";
-       sha256 = "01i8v4l47xp5f4i9czlwg1kk4lvnfmxhgqlcnacirrp0pfjmrq7p";
+       version = "0.6.1";
+       sha256 = "0yihvjijag9g55ihrgqj0vwn6ksvscj3r0n2zzxz2qbxrhx6m1pq";
        libraryHaskellDepends = [
          aeson base bifunctors binary deepseq ghc-prim hashable lens
          QuickCheck strict
@@ -193988,6 +193319,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "string-transform_1_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, tasty, tasty-hunit
+     , tasty-smallcheck, text, utf8-string
+     }:
+     mkDerivation {
+       pname = "string-transform";
+       version = "1.0.0";
+       sha256 = "0556blv06jl973pnkcab36bsa3kjzjhzs396q31qmkqnqlpday4d";
+       libraryHaskellDepends = [ base bytestring text utf8-string ];
+       testHaskellDepends = [
+         base bytestring tasty tasty-hunit tasty-smallcheck text utf8-string
+       ];
+       homepage = "https://github.com/ncaq/string-transform#readme";
+       description = "simple and easy haskell string transform wrapper";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "string-typelits" = callPackage
     ({ mkDerivation, base, template-haskell, type-combinators
      , type-combinators-quote
@@ -195525,34 +194874,6 @@ self: {
      }:
      mkDerivation {
        pname = "swagger-petstore";
-       version = "0.0.1.7";
-       sha256 = "07p2hd35wg5g1r3lmhffvjch5vy6idmhdv21k1g8v3131apgjpxy";
-       libraryHaskellDepends = [
-         aeson base base64-bytestring bytestring case-insensitive containers
-         deepseq exceptions http-api-data http-client http-client-tls
-         http-media http-types iso8601-time katip microlens mtl network
-         random safe-exceptions text time transformers unordered-containers
-         vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers hspec iso8601-time mtl QuickCheck
-         semigroups text time transformers unordered-containers vector
-       ];
-       homepage = "https://github.com/swagger-api/swagger-codegen#readme";
-       description = "Auto-generated swagger-petstore API Client";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "swagger-petstore_0_0_1_8" = callPackage
-    ({ mkDerivation, aeson, base, base64-bytestring, bytestring
-     , case-insensitive, containers, deepseq, exceptions, hspec
-     , http-api-data, http-client, http-client-tls, http-media
-     , http-types, iso8601-time, katip, microlens, mtl, network
-     , QuickCheck, random, safe-exceptions, semigroups, text, time
-     , transformers, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "swagger-petstore";
        version = "0.0.1.8";
        sha256 = "1rslv21lg7jfc6vb8yyb6kkg3cma2300h4hld3m8zwfxgzcq79h7";
        libraryHaskellDepends = [
@@ -195569,7 +194890,6 @@ self: {
        homepage = "https://github.com/swagger-api/swagger-codegen#readme";
        description = "Auto-generated swagger-petstore API Client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "swagger-test" = callPackage
@@ -195614,6 +194934,8 @@ self: {
        pname = "swagger2";
        version = "2.2";
        sha256 = "0byzfz52mbnxcmspmk4s43bhprfwrjnh2mkpyfrdir64axqx7yf6";
+       revision = "1";
+       editedCabalFile = "0dhs44zhb2yh4yxw88yvlijcd255ppm1ch7dz7pn7sdv1wr6kxq5";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          aeson base base-compat bytestring containers generics-sop hashable
@@ -198188,24 +197510,6 @@ self: {
      }:
      mkDerivation {
        pname = "tasty-ant-xml";
-       version = "1.1.2";
-       sha256 = "10k8092iz8klx7wa3ajfny8zvrxv3clz330v3qz3k7dmbj596nhq";
-       libraryHaskellDepends = [
-         base containers directory filepath generic-deriving ghc-prim mtl
-         stm tagged tasty transformers xml
-       ];
-       homepage = "http://github.com/ocharles/tasty-ant-xml";
-       description = "Render tasty output to XML for Jenkins";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "tasty-ant-xml_1_1_3" = callPackage
-    ({ mkDerivation, base, containers, directory, filepath
-     , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers
-     , xml
-     }:
-     mkDerivation {
-       pname = "tasty-ant-xml";
        version = "1.1.3";
        sha256 = "0nxrvxk83mv29yhywswg21q156zdzs02xrwqambnz78pldsrbk4n";
        libraryHaskellDepends = [
@@ -198215,7 +197519,6 @@ self: {
        homepage = "http://github.com/ocharles/tasty-ant-xml";
        description = "Render tasty output to XML for Jenkins";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-auto" = callPackage
@@ -198382,6 +197685,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tasty-hedgehog_0_1_0_2" = callPackage
+    ({ mkDerivation, base, hedgehog, tagged, tasty
+     , tasty-expected-failure
+     }:
+     mkDerivation {
+       pname = "tasty-hedgehog";
+       version = "0.1.0.2";
+       sha256 = "0cjdi0kpwpb4m5ad1y47x52336xfza4m82h5zg76r75f7fvzzh8x";
+       libraryHaskellDepends = [ base hedgehog tagged tasty ];
+       testHaskellDepends = [
+         base hedgehog tasty tasty-expected-failure
+       ];
+       homepage = "https://github.com/qfpl/tasty-hedghog";
+       description = "Integrates the hedgehog testing library with the tasty testing framework";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-hspec" = callPackage
     ({ mkDerivation, base, hspec, hspec-core, QuickCheck, tasty
      , tasty-quickcheck, tasty-smallcheck
@@ -198612,23 +197933,6 @@ self: {
      }:
      mkDerivation {
        pname = "tasty-rerun";
-       version = "1.1.9";
-       sha256 = "0piwv5nrqvwnzp76xpsjlncrl2cd9jsxxb1ghkaijn2fi2c63akd";
-       libraryHaskellDepends = [
-         base containers mtl optparse-applicative reducers split stm tagged
-         tasty transformers
-       ];
-       homepage = "http://github.com/ocharles/tasty-rerun";
-       description = "Run tests by filtering the test tree depending on the result of previous test runs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "tasty-rerun_1_1_10" = callPackage
-    ({ mkDerivation, base, containers, mtl, optparse-applicative
-     , reducers, split, stm, tagged, tasty, transformers
-     }:
-     mkDerivation {
-       pname = "tasty-rerun";
        version = "1.1.10";
        sha256 = "1776fx700wlc9spn0dh3x4nh44x2yg33z9zyqzqlpwrhrkpaz91b";
        libraryHaskellDepends = [
@@ -198638,7 +197942,6 @@ self: {
        homepage = "http://github.com/ocharles/tasty-rerun";
        description = "Run tests by filtering the test tree depending on the result of previous test runs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-silver" = callPackage
@@ -201024,29 +200327,6 @@ self: {
      }) {};
 
   "text-ldap" = callPackage
-    ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring
-     , containers, dlist, QuickCheck, quickcheck-simple, random
-     , transformers
-     }:
-     mkDerivation {
-       pname = "text-ldap";
-       version = "0.1.1.10";
-       sha256 = "13wjarsshp64cc632bqmckx664a57w7cnlm8gs7rfp1bcm7vdnjk";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         attoparsec base base64-bytestring bytestring containers dlist
-         transformers
-       ];
-       executableHaskellDepends = [ base bytestring ];
-       testHaskellDepends = [
-         base bytestring QuickCheck quickcheck-simple random
-       ];
-       description = "Parser and Printer for LDAP text data stream";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "text-ldap_0_1_1_11" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers, dlist
      , memory, QuickCheck, quickcheck-simple, random, transformers
      }:
@@ -201065,7 +200345,6 @@ self: {
        ];
        description = "Parser and Printer for LDAP text data stream";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-lens" = callPackage
@@ -202035,19 +201314,6 @@ self: {
     ({ mkDerivation, base, ghc-prim, template-haskell }:
      mkDerivation {
        pname = "th-lift";
-       version = "0.7.7";
-       sha256 = "1dfb0z42vrmdx579lkam07ic03d3v5y19339a3ca0bwpprpzmihn";
-       libraryHaskellDepends = [ base ghc-prim template-haskell ];
-       testHaskellDepends = [ base ghc-prim template-haskell ];
-       homepage = "http://github.com/mboes/th-lift";
-       description = "Derive Template Haskell's Lift class for datatypes";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "th-lift_0_7_8" = callPackage
-    ({ mkDerivation, base, ghc-prim, template-haskell }:
-     mkDerivation {
-       pname = "th-lift";
        version = "0.7.8";
        sha256 = "0ay10b78x3969rpqqrgzy8srkl6iby2cljbf3mm17na8x22k7y1c";
        libraryHaskellDepends = [ base ghc-prim template-haskell ];
@@ -202055,7 +201321,6 @@ self: {
        homepage = "http://github.com/mboes/th-lift";
        description = "Derive Template Haskell's Lift class for datatypes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-lift-instances" = callPackage
@@ -208122,26 +207387,6 @@ self: {
      }:
      mkDerivation {
        pname = "type-of-html";
-       version = "1.3.2.1";
-       sha256 = "1c7yj9fh9dxkif2f116cjjgz2prdz1a3xaqni5m9gmvy2y5gvbdn";
-       libraryHaskellDepends = [
-         base bytestring double-conversion ghc-prim text
-       ];
-       testHaskellDepends = [ base hspec QuickCheck ];
-       benchmarkHaskellDepends = [
-         base blaze-html bytestring criterion QuickCheck text
-       ];
-       homepage = "https://github.com/knupfer/type-of-html";
-       description = "High performance type driven html generation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "type-of-html_1_3_3_0" = callPackage
-    ({ mkDerivation, base, blaze-html, bytestring, criterion
-     , double-conversion, ghc-prim, hspec, QuickCheck, text
-     }:
-     mkDerivation {
-       pname = "type-of-html";
        version = "1.3.3.0";
        sha256 = "0q3r2imr63nv7l08w6q850xqak4gwzvk43qv1vq8x9qwdaf1nisv";
        libraryHaskellDepends = [
@@ -208154,7 +207399,6 @@ self: {
        homepage = "https://github.com/knupfer/type-of-html";
        description = "High performance type driven html generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-operators" = callPackage
@@ -212277,6 +211521,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "validity_0_4_0_4" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "validity";
+       version = "0.4.0.4";
+       sha256 = "1iva60sfaqnkwdk5b2w6skvsg6096x24bjyd5h057n9dlbimiblx";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "Validity typeclass";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "validity-aeson" = callPackage
     ({ mkDerivation, aeson, base, validity, validity-scientific
      , validity-text, validity-unordered-containers, validity-vector
@@ -212354,6 +211611,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "validity-text_0_2_0_1" = callPackage
+    ({ mkDerivation, base, bytestring, text, validity }:
+     mkDerivation {
+       pname = "validity-text";
+       version = "0.2.0.1";
+       sha256 = "1r96nn0y7hgm49y79kf3n86960z7gbz2mw4wcnsi9qlccnjq5qk4";
+       libraryHaskellDepends = [ base bytestring text validity ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "Validity instances for text";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "validity-time" = callPackage
     ({ mkDerivation, base, time, validity }:
      mkDerivation {
@@ -212943,26 +212213,6 @@ self: {
      }:
      mkDerivation {
        pname = "vector-binary-instances";
-       version = "0.2.3.5";
-       sha256 = "0niad09lbxz3cj20qllyj92lwbc013ihw4lby8fv07x5xjx5a4p1";
-       revision = "1";
-       editedCabalFile = "0yk61mifvcc31vancsfsd0vskqh5k3a3znx1rbz8wzcs4ijjzh48";
-       libraryHaskellDepends = [ base binary vector ];
-       testHaskellDepends = [ base binary tasty tasty-quickcheck vector ];
-       benchmarkHaskellDepends = [
-         base binary bytestring criterion deepseq vector
-       ];
-       homepage = "https://github.com/bos/vector-binary-instances";
-       description = "Instances of Data.Binary and Data.Serialize for vector";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "vector-binary-instances_0_2_4" = callPackage
-    ({ mkDerivation, base, binary, bytestring, criterion, deepseq
-     , tasty, tasty-quickcheck, vector
-     }:
-     mkDerivation {
-       pname = "vector-binary-instances";
        version = "0.2.4";
        sha256 = "1y236jb72iab9ska1mc48z6yb0xgwmj45laaqdyjxksd84z7hbrb";
        libraryHaskellDepends = [ base binary vector ];
@@ -212973,7 +212223,6 @@ self: {
        homepage = "https://github.com/bos/vector-binary-instances";
        description = "Instances of Data.Binary and Data.Serialize for vector";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector-buffer" = callPackage
@@ -215471,8 +214720,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-middleware-rollbar";
-       version = "0.8.2";
-       sha256 = "08bzikcfgrni328mmxwxsr4kbsc5bjjacbxm18hs74b8n4g5f1qd";
+       version = "0.8.3";
+       sha256 = "17ys7ddpfa0sbjh79k240zqk2v7nlh0v7hrgr7kanal3pk7mvwvm";
        libraryHaskellDepends = [
          aeson base bytestring case-insensitive hostname http-client
          http-conduit http-types network text time unordered-containers uuid
@@ -215487,7 +214736,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "wai-middleware-rollbar_0_8_3" = callPackage
+  "wai-middleware-rollbar_0_8_4" = callPackage
     ({ mkDerivation, aeson, base, bytestring, case-insensitive
      , containers, hostname, hspec, hspec-golden-aeson, http-client
      , http-conduit, http-types, lens, lens-aeson, network, QuickCheck
@@ -215495,8 +214744,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-middleware-rollbar";
-       version = "0.8.3";
-       sha256 = "17ys7ddpfa0sbjh79k240zqk2v7nlh0v7hrgr7kanal3pk7mvwvm";
+       version = "0.8.4";
+       sha256 = "1yycbkcc7jq8mlv6jslnq2j0w8yhv4859fds34pg2k1fg7ccb1iw";
        libraryHaskellDepends = [
          aeson base bytestring case-insensitive hostname http-client
          http-conduit http-types network text time unordered-containers uuid
@@ -216767,27 +216016,6 @@ self: {
      }:
      mkDerivation {
        pname = "web-routes";
-       version = "0.27.13";
-       sha256 = "10b0hs7mmvs9ay3ik93s8xd7zlx8pyz20626nrha4mwyixgkmc59";
-       revision = "1";
-       editedCabalFile = "1s8ax7r8l0484730p36c3gn3n28zhl2p1nwjnprsbhcxd83yq4dh";
-       libraryHaskellDepends = [
-         base blaze-builder bytestring exceptions ghc-prim http-types mtl
-         parsec split text utf8-string
-       ];
-       testHaskellDepends = [ base hspec HUnit QuickCheck text ];
-       homepage = "http://www.happstack.com/docs/crashcourse/index.html#web-routes";
-       description = "portable, type-safe URL routing";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "web-routes_0_27_14" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring, exceptions
-     , ghc-prim, hspec, http-types, HUnit, mtl, parsec, QuickCheck
-     , split, text, utf8-string
-     }:
-     mkDerivation {
-       pname = "web-routes";
        version = "0.27.14";
        sha256 = "1m5ywqy2c9v478ybyrzqc407zdqcg18p5587mrq34v7bnjk27rak";
        revision = "1";
@@ -216800,7 +216028,6 @@ self: {
        homepage = "http://www.happstack.com/docs/crashcourse/index.html#web-routes";
        description = "portable, type-safe URL routing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "web-routes-boomerang" = callPackage
@@ -216915,21 +216142,6 @@ self: {
      }:
      mkDerivation {
        pname = "web-routes-wai";
-       version = "0.24.3";
-       sha256 = "070gldklv52gpvas676nw9igr4d3cd1f23prlmd2qjrjn3qvhdq7";
-       libraryHaskellDepends = [
-         base bytestring http-types text wai web-routes
-       ];
-       description = "Library for maintaining correctness of URLs within an application";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "web-routes-wai_0_24_3_1" = callPackage
-    ({ mkDerivation, base, bytestring, http-types, text, wai
-     , web-routes
-     }:
-     mkDerivation {
-       pname = "web-routes-wai";
        version = "0.24.3.1";
        sha256 = "0j9h22nsj7zf5qpf4i07jdcih00r2fivdilvj8wsylk4d23x27wf";
        libraryHaskellDepends = [
@@ -216937,7 +216149,6 @@ self: {
        ];
        description = "Library for maintaining correctness of URLs within an application";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "web-routing" = callPackage
@@ -218216,23 +217427,6 @@ self: {
      }:
      mkDerivation {
        pname = "withdependencies";
-       version = "0.2.4.1";
-       sha256 = "16mxhm0as0598z4w4rhfqxbnasjnzlzsb5nj12b7m8hdg5cg3x6a";
-       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;
-     }) {};
-
-  "withdependencies_0_2_4_2" = callPackage
-    ({ mkDerivation, base, conduit, containers, hspec, HUnit, mtl
-     , profunctors
-     }:
-     mkDerivation {
-       pname = "withdependencies";
        version = "0.2.4.2";
        sha256 = "04pk5giqlnls1p62fz9p0sb1288c9qk3ivsq2kb5207cjifyslgz";
        libraryHaskellDepends = [
@@ -218242,7 +217436,6 @@ self: {
        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
@@ -220431,28 +219624,6 @@ self: {
      }:
      mkDerivation {
        pname = "xls";
-       version = "0.1.0";
-       sha256 = "1w23dqrzc532vgzsmjkks1hm1r0i4jnj1bfxak9c71j9svna50n5";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base conduit filepath resourcet transformers
-       ];
-       executableHaskellDepends = [
-         base conduit getopt-generics resourcet transformers
-       ];
-       testHaskellDepends = [ base ];
-       homepage = "http://github.com/harendra-kumar/xls";
-       description = "Parse Microsoft Excel xls files (BIFF/Excel 97-2004)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "xls_0_1_1" = callPackage
-    ({ mkDerivation, base, conduit, filepath, getopt-generics
-     , resourcet, transformers
-     }:
-     mkDerivation {
-       pname = "xls";
        version = "0.1.1";
        sha256 = "0a09zw90xiaklr68w932md38s95jzwid914lw7frnf3qd8j12xq9";
        isLibrary = true;
@@ -220467,7 +219638,6 @@ self: {
        homepage = "http://github.com/harendra-kumar/xls";
        description = "Parse Microsoft Excel xls files (BIFF/Excel 97-2004)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xlsior" = callPackage
@@ -226604,6 +225774,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) unzip; inherit (pkgs) zip;};
 
+  "zip-archive_0_3_2_3" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, Cabal, containers
+     , digest, directory, filepath, HUnit, mtl, old-time, pretty
+     , process, temporary, text, time, unix, unzip, zip, zlib
+     }:
+     mkDerivation {
+       pname = "zip-archive";
+       version = "0.3.2.3";
+       sha256 = "1b3zll9j3w57kxnng09c5xcj0d18ldj9i3f8qks4kyyrsgyviw9x";
+       isLibrary = true;
+       isExecutable = true;
+       setupHaskellDepends = [ base Cabal ];
+       libraryHaskellDepends = [
+         array base binary bytestring containers digest directory filepath
+         mtl old-time pretty text time unix zlib
+       ];
+       libraryToolDepends = [ unzip ];
+       executableHaskellDepends = [ base bytestring directory ];
+       testHaskellDepends = [
+         base bytestring directory filepath HUnit old-time process temporary
+         time unix
+       ];
+       testToolDepends = [ unzip zip ];
+       homepage = "http://github.com/jgm/zip-archive";
+       description = "Library for creating and modifying zip archives";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) unzip; inherit (pkgs) zip;};
+
   "zip-conduit" = callPackage
     ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra
      , criterion, digest, directory, filepath, hpc, HUnit, LibZip, mtl
diff --git a/pkgs/development/interpreters/python/build-python-package.nix b/pkgs/development/interpreters/python/build-python-package.nix
index 12d17b2e8322..6a07a006c6b5 100644
--- a/pkgs/development/interpreters/python/build-python-package.nix
+++ b/pkgs/development/interpreters/python/build-python-package.nix
@@ -6,7 +6,7 @@
 , wrapPython
 , setuptools
 , unzip
-, ensureNewerSourcesHook
+, ensureNewerSourcesForZipFilesHook
 , toPythonModule
 , namePrefix
 , bootstrapped-pip
@@ -19,7 +19,7 @@ let
   wheel-specific = import ./build-python-package-wheel.nix { };
   common = import ./build-python-package-common.nix { inherit python bootstrapped-pip; };
   mkPythonDerivation = import ./mk-python-derivation.nix {
-    inherit lib python wrapPython setuptools unzip ensureNewerSourcesHook toPythonModule namePrefix;
+    inherit lib python wrapPython setuptools unzip ensureNewerSourcesForZipFilesHook toPythonModule namePrefix;
   };
 in
 
diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix
index d9cff16f448f..96a9cdf0c615 100644
--- a/pkgs/development/interpreters/python/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/mk-python-derivation.nix
@@ -5,7 +5,7 @@
 , wrapPython
 , setuptools
 , unzip
-, ensureNewerSourcesHook
+, ensureNewerSourcesForZipFilesHook
 # Whether the derivation provides a Python module or not.
 , toPythonModule
 , namePrefix
@@ -69,7 +69,7 @@ toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attrs [
 
   name = namePrefix + name;
 
-  nativeBuildInputs = [ (ensureNewerSourcesHook { year = "1980"; }) ]
+  nativeBuildInputs = [ ensureNewerSourcesForZipFilesHook ]
     ++ nativeBuildInputs;
 
   buildInputs = [ wrapPython ]
diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix
index 4e6fe783dc2c..f33e52867c56 100644
--- a/pkgs/development/libraries/grpc/default.nix
+++ b/pkgs/development/libraries/grpc/default.nix
@@ -1,19 +1,26 @@
 { stdenv, fetchurl, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }:
 
-stdenv.mkDerivation rec
-  { name = "grpc-1.8.3";
-    src = fetchurl
-      { url = "https://github.com/grpc/grpc/archive/v1.8.3.tar.gz";
-        sha256 = "14ichjllvhkbv8sjh9j5njnagpqw2sl12n41ga90jnj7qvfwwjy1";
-      };
-    nativeBuildInputs = [ cmake pkgconfig ];
-    buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ];
-    cmakeFlags =
-      [ "-DgRPC_ZLIB_PROVIDER=package"
-        "-DgRPC_CARES_PROVIDER=package"
-        "-DgRPC_SSL_PROVIDER=package"
-        "-DgRPC_PROTOBUF_PROVIDER=package"
-        "-DgRPC_GFLAGS_PROVIDER=package"
-      ];
-    enableParallelBuilds = true;
-  }
+stdenv.mkDerivation rec {
+  version = "1.9.1";
+  name = "grpc-${version}";
+  src = fetchurl {
+    url = "https://github.com/grpc/grpc/archive/v${version}.tar.gz";
+    sha256 = "0h2w0dckxydngva9kl7dpilif8k9zi2ajnlanscr7s5kkza3dhps";
+  };
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ];
+  cmakeFlags =
+    [ "-DgRPC_ZLIB_PROVIDER=package"
+      "-DgRPC_CARES_PROVIDER=package"
+      "-DgRPC_SSL_PROVIDER=package"
+      "-DgRPC_PROTOBUF_PROVIDER=package"
+      "-DgRPC_GFLAGS_PROVIDER=package"
+    ];
+  enableParallelBuilds = true;
+
+  meta = with stdenv.lib; {
+    description = "The C based gRPC (C++, Python, Ruby, Objective-C, PHP, C#)";
+    license = licenses.asl20;
+    homepage = https://grpc.io/;
+  };
+}
diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix
index f02843707265..fc4c280d47c2 100644
--- a/pkgs/development/libraries/libyaml-cpp/default.nix
+++ b/pkgs/development/libraries/libyaml-cpp/default.nix
@@ -2,28 +2,26 @@
 
 stdenv.mkDerivation rec {
   name = "libyaml-cpp-${version}";
-  version = "0.5.3";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "jbeder";
     repo = "yaml-cpp";
-    rev = "release-${version}";
-    sha256 = "0qr286q8mwbr4cxz0y0rf045zc071qh3cb804by6w1ydlqciih8a";
+    rev = "yaml-cpp-${version}";
+    sha256 = "16x53p9gfch7gpyg865j7m1zhqsixx2hbbd206ffjv0ip8cjipjf";
   };
 
   outputs = [ "out" "dev" ];
 
-  buildInputs = [ cmake boost ];
+  nativeBuildInputs = [ cmake ];
 
   cmakeFlags = "-DBUILD_SHARED_LIBS=ON";
 
-  enableParallelBuilding = true;
-
   meta = with stdenv.lib; {
     inherit (src.meta) homepage;
     description = "A YAML parser and emitter for C++";
     license = licenses.mit;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ wkennington ];
+    maintainers = with maintainers; [ andir ];
   };
 }
diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix
index 2dcc7e9a53dd..8ccaf726e6b0 100644
--- a/pkgs/development/libraries/nix-plugins/default.nix
+++ b/pkgs/development/libraries/nix-plugins/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, nix, boehmgc }:
-let version = "2.0.7"; in
+{ stdenv, fetchFromGitHub, nix, cmake, pkgconfig }:
+let version = "3.0.1"; in
 stdenv.mkDerivation {
   name = "nix-plugins-${version}";
 
@@ -7,12 +7,12 @@ stdenv.mkDerivation {
     owner = "shlevy";
     repo = "nix-plugins";
     rev = version;
-    sha256 = "1q4ydp2w114wbfm41m4qgrabha7ifa17xyz5dr137vvnj6njp4vs";
+    sha256 = "1pmk2m0kc6a3jqygm5cy1fl5gbcy0ghc2xs4ww0gh20walrys82r";
   };
 
-  buildFlags = [ "NIX_INCLUDE=${nix.dev}/include" "GC_INCLUDE=${boehmgc.dev}/include" ];
+  nativeBuildInputs = [ cmake pkgconfig ];
 
-  installFlags = [ "PREFIX=$(out)" ];
+  buildInputs = [ nix ];
 
   meta = {
     description = "Collection of miscellaneous plugins for the nix expression language";
diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix
index e2c80e445e76..42c4b028aa83 100644
--- a/pkgs/development/libraries/qpdf/default.nix
+++ b/pkgs/development/libraries/qpdf/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, libjpeg, zlib, perl }:
 
-let version = "7.0.0";
+let version = "7.1.1";
 in
 stdenv.mkDerivation rec {
   name = "qpdf-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/qpdf/qpdf/${version}/${name}.tar.gz";
-    sha256 = "0py6p27fx4qrwq9mvcybna42b0bdi359x38lzmggxl5a9khqvl7y";
+    sha256 = "1ypjxm74dhn9c4mj027zzkh0z4kpw9xiqwh3pjmmghm502hby3ca";
   };
 
   nativeBuildInputs = [ perl ];
diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix
new file mode 100644
index 000000000000..5fdbd7766cf8
--- /dev/null
+++ b/pkgs/development/tools/buildah/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub, runCommand
+, gpgme, libgpgerror, devicemapper, btrfs-progs, pkgconfig, ostree, libselinux
+, go-md2man }:
+
+let
+  version = "0.11";
+
+  src = fetchFromGitHub {
+    rev = "v${version}";
+    owner = "projectatomic";
+    repo = "buildah";
+    sha256 = "0rq3dw6p9rcqc99jk93j0qwg1p8fh4pwqvzylcqlcyqhv46426zf";
+  };
+  goPackagePath = "github.com/projectatomic/buildah";
+
+in buildGoPackage rec {
+  name = "buildah-${version}";
+  inherit src;
+
+  outputs = [ "bin" "man" "out" ];
+
+  inherit goPackagePath;
+  excludedPackages = [ "tests" ];
+
+  nativeBuildInputs = [ pkgconfig go-md2man.bin ];
+  buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs ostree libselinux ];
+
+  # Copied from the skopeo package, doesn’t seem to make a difference?
+  # If something related to these libs failed, uncomment these lines.
+  /*preBuild = with lib; ''
+    export CGO_CFLAGS="-I${getDev gpgme}/include -I${getDev libgpgerror}/include -I${getDev devicemapper}/include -I${getDev btrfs-progs}/include"
+    export CGO_LDFLAGS="-L${getLib gpgme}/lib -L${getLib libgpgerror}/lib -L${getLib devicemapper}/lib"
+  '';*/
+
+  postBuild = ''
+    # depends on buildGoPackage not changing …
+    pushd ./go/src/${goPackagePath}/docs
+    make docs
+    make install PREFIX="$man"
+    popd
+  '';
+
+  meta = {
+    description = "A tool which facilitates building OCI images";
+    homepage = https://github.com/projectatomic/buildah;
+    maintainers = with stdenv.lib.maintainers; [ Profpatsch ];
+    license = stdenv.lib.licenses.asl20;
+  };
+}
diff --git a/pkgs/development/tools/gomodifytags/default.nix b/pkgs/development/tools/gomodifytags/default.nix
new file mode 100644
index 000000000000..f1452bc12114
--- /dev/null
+++ b/pkgs/development/tools/gomodifytags/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, lib, buildGoPackage, fetchgit }:
+
+buildGoPackage rec {
+  name = "gomodifytags-${version}";
+  version = "unstable-2017-12-14";
+  rev = "20644152db4fe0ac406d81f3848e8a15f0cdeefa";
+
+  goPackagePath = "github.com/fatih/gomodifytags";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/fatih/gomodifytags";
+    sha256 = "0k0ly3mmm9zcaxwlzdbvdxr2gn7kvcqzk1bb7blgq7fkkzpp7i1q";
+  };
+
+  meta = {
+    description = "Go tool to modify struct field tags.";
+    homepage = https://github.com/fatih/gomodifytags;
+    maintainers = with stdenv.lib.maintainers; [ vdemeester ];
+    license = stdenv.lib.licenses.bsd3;
+  };
+}
diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
index c21d5595708a..ae78774f8f38 100644
--- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
+++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
@@ -8,8 +8,8 @@ mkDerivation {
   src = fetchFromGitHub {
     owner = "hvr";
     repo = "multi-ghc-travis";
-    rev = "0d1b4089f6829659149747c9551712d24fd0b124";
-    sha256 = "00dbg8hbncv74c2baskyhg4h0yv8wrz0fnkvw2bzcn0cjrz7xqwr";
+    rev = "612a29439ba61b01efb98ea6d36b7ffd987dc5a0";
+    sha256 = "0q416rzzwipbnvslhwmm43w38dwma3lks12fghb0svcwj5lzgxsf";
   };
   isLibrary = true;
   isExecutable = true;
diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix
index 65c2a42922b2..bf451af9ad73 100644
--- a/pkgs/games/openxcom/default.nix
+++ b/pkgs/games/openxcom/default.nix
@@ -1,22 +1,18 @@
-{stdenv, fetchurl, fetchpatch, cmake, mesa, zlib, openssl, libyamlcpp, boost
+{stdenv, fetchFromGitHub, fetchpatch, cmake, mesa, zlib, openssl, libyamlcpp, boost
 , SDL, SDL_image, SDL_mixer, SDL_gfx }:
 
-let version = "1.0.0"; in
+let version = "1.0.0.2018.01.28"; in
 stdenv.mkDerivation {
   name = "openxcom-${version}";
-  src = fetchurl {
-    url = http://openxcom.org/file/1726/;
-    sha256 = "1rmg10nklvf86ckbbssyvbg5cd4p7in5zq3mas2yyffdjk9i40v6";
-    name = "openxcom-${version}.tar.gz";
+  src = fetchFromGitHub {
+    owner = "SupSuper";
+    repo = "OpenXcom";
+    rev = "b148916268a6ce104c3b6b7eb4d9e0487cba5487";
+    sha256 = "1128ip3g4aw59f3f23mvlyhl8xckhwjjw9rd7wn7xv51hxdh191c";
   };
 
-  buildInputs = [ cmake mesa zlib openssl libyamlcpp boost
-    SDL SDL_image SDL_mixer SDL_gfx ];
-
-  patches = [ (fetchpatch {
-    url = "https://github.com/SupSuper/OpenXcom/commit/49bec0851fc6e5365cac0f71b2c40a80ddf95e77.patch";
-    sha256 = "156fk8wz4qc0nmqq3zjb6kw84qirabads2azr6xvlgb3lcn327v2";
-  }) ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ SDL SDL_gfx SDL_image SDL_mixer boost libyamlcpp mesa openssl zlib ];
 
   meta = {
     description = "Open source clone of UFO: Enemy Unknown";
diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 2d7ce06ebe1c..96aa426b12ea 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,13 +3,13 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.18";
+  version = "4.14.19";
 
   # branchVersion needs to be x.y
   extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0m73kz9jg6mylgql0zzypm76g6x7m3bq7dklivhkm4ldqg0r8sl6";
+    sha256 = "0gj7mq0dnb914mm4rari9z2cxbybskv1587606aq6f9nv1qp3kn5";
   };
 } // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index da3f07e845d6..2bb8ac1d948d 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.80";
+  version = "4.9.81";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0ys74q9f93c42flqracaqnkh0qwcbnimhppd80rz5hxgq3686bly";
+    sha256 = "1bjwca7m3ksab6d23a05ciphzaj6nv6qmc5n6dxrgim0yhjpmvk4";
   };
 } // (args.argsOverride or {}))
diff --git a/pkgs/tools/inputmethods/interception-tools/default.nix b/pkgs/tools/inputmethods/interception-tools/default.nix
index 77ac02649ad3..33fea9705acd 100644
--- a/pkgs/tools/inputmethods/interception-tools/default.nix
+++ b/pkgs/tools/inputmethods/interception-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, cmake, libyamlcppWithoutBoost,
+{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, cmake, libyamlcpp,
   libevdev, libudev }:
 
 let
@@ -12,8 +12,8 @@ in stdenv.mkDerivation {
     sha256 = "14g4pphvylqdb922va322z1pbp12ap753hcf7zf9sii1ikvif83j";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cmake libevdev libudev libyamlcppWithoutBoost ];
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [ libevdev libudev libyamlcpp ];
 
   prePatch = ''
     substituteInPlace CMakeLists.txt --replace \
diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix
index a1c04f06d144..97c0251d9d64 100644
--- a/pkgs/tools/misc/cloc/default.nix
+++ b/pkgs/tools/misc/cloc/default.nix
@@ -1,21 +1,25 @@
-{ stdenv, fetchFromGitHub, makeWrapper, perl, AlgorithmDiff, RegexpCommon }:
+{ stdenv, fetchFromGitHub, makeWrapper, perl
+, AlgorithmDiff, ParallelForkManager, RegexpCommon
+}:
 
 stdenv.mkDerivation rec {
   name = "cloc-${version}";
-  version = "1.74";
+  version = "1.76";
 
   src = fetchFromGitHub {
     owner = "AlDanial";
     repo = "cloc";
-    rev = version;
-    sha256 = "1ihma4f6f92jp1mvzr4rjrgyh9m5wzrlxngaxfn7g0a8r2kyi65b";
+    rev = "v${version}";
+    sha256 = "03z4ar959ximsddd92zchi013lh82ganzisk309y3b09q10hl9k7";
   };
 
   setSourceRoot = ''
     sourceRoot=$(echo */Unix)
   '';
 
-  buildInputs = [ makeWrapper perl AlgorithmDiff RegexpCommon ];
+  buildInputs = [
+    makeWrapper perl AlgorithmDiff ParallelForkManager RegexpCommon
+  ];
 
   makeFlags = [ "prefix=" "DESTDIR=$(out)" "INSTALL=install" ];
 
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 3f77e47868b8..0b6f2400bb05 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -151,12 +151,12 @@ in rec {
 
   nixUnstable = (lib.lowPrio (common rec {
     name = "nix-2.0${suffix}";
-    suffix = "pre5889_c287d731";
+    suffix = "pre5943_52c777a7";
     src = fetchFromGitHub {
       owner = "NixOS";
       repo = "nix";
-      rev = "c287d7312103bae5e154c0c4dd493371a22ea207";
-      sha256 = "1dwhz93dlk62prh3wfwf8vxfcqjdn21wk0ms65kf5r8ahkfgpgq4";
+      rev = "52c777a79318c85c8fbd8c02174a03511de278db";
+      sha256 = "0qwmyy7l16djrlksfpjfkfkh5v9s0cyg6ca2809m1qb6swfzqqdf";
     };
     fromGit = true;
   })) // { perl-bindings = perl-bindings { nix = nixUnstable; }; };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f4f7f59dcc48..f45d74def67e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -92,6 +92,10 @@ with pkgs;
       }
     '');
 
+  # Zip file format only allows times after year 1980, which makes e.g. Python wheel building fail with:
+  # ValueError: ZIP does not support timestamps before 1980
+  ensureNewerSourcesForZipFilesHook = ensureNewerSourcesHook { year = "1980"; };
+
   updateAutotoolsGnuConfigScriptsHook = makeSetupHook
     { substitutions = { gnu_config = gnu-config;}; }
     ../build-support/setup-hooks/update-autotools-gnu-config-scripts.sh;
@@ -868,6 +872,8 @@ with pkgs;
 
   btfs = callPackage ../os-specific/linux/btfs { };
 
+  buildah = callPackage ../development/tools/buildah { };
+
   burpsuite = callPackage ../tools/networking/burpsuite {};
 
   c3d = callPackage ../applications/graphics/c3d {
@@ -1668,7 +1674,7 @@ with pkgs;
   client-ip-echo = callPackage ../servers/misc/client-ip-echo { };
 
   cloc = callPackage ../tools/misc/cloc {
-    inherit (perlPackages) perl AlgorithmDiff RegexpCommon;
+    inherit (perlPackages) perl AlgorithmDiff ParallelForkManager RegexpCommon;
   };
 
   cloog = callPackage ../development/libraries/cloog {
@@ -6902,8 +6908,8 @@ with pkgs;
 
   pachyderm = callPackage ../applications/networking/cluster/pachyderm { };
 
-  php = php71;
-  phpPackages = php71Packages;
+  php = php72;
+  phpPackages = php72Packages;
 
   php56Packages = recurseIntoAttrs (callPackage ./php-packages.nix {
     php = php56;
@@ -6928,13 +6934,17 @@ with pkgs;
     php71
     php72;
 
-  php-embed = php71-embed;
+  php-embed = php72-embed;
 
   php71-embed = php71.override {
     config.php.embed = true;
     config.php.apxs2 = false;
   };
 
+  php72-embed = php72.override {
+    config.php.embed = true;
+    config.php.apxs2 = false;
+  };
 
   picoc = callPackage ../development/interpreters/picoc {};
 
@@ -10172,23 +10182,6 @@ with pkgs;
       };
   });
 
-  # interception-tools needs this. This should be removed when there is a new
-  # release of libyamlcpp, i.e. when the version of libyamlcpp is newer than
-  # 0.5.3.
-  libyamlcppWithoutBoost = libyamlcpp.overrideAttrs (oldAttrs: rec {
-    name = "libyaml-cpp-${version}";
-    version = "2017-08-25";
-
-    src = fetchFromGitHub {
-      owner = "jbeder";
-      repo = "yaml-cpp";
-      rev = "beb44b872c07c74556314e730c6f20a00b32e8e5";
-      sha256 = "1qkr3i5lin6m36w5rbimc7pjx3nx686xnjb6lw00xf67iqrl4h4m";
-    };
-
-    buildInputs = [ cmake ];
-  });
-
   libykneomgr = callPackage ../development/libraries/libykneomgr { };
 
   libytnef = callPackage ../development/libraries/libytnef { };
@@ -10409,7 +10402,8 @@ with pkgs;
   };
   libnghttp2 = nghttp2.lib;
 
-  nix-plugins = callPackage ../development/libraries/nix-plugins {};
+  nix-plugins = callPackage ../development/libraries/nix-plugins
+    { nix = nixUnstable; };
 
   nlohmann_json = callPackage ../development/libraries/nlohmann_json { };
 
@@ -13393,6 +13387,8 @@ with pkgs;
 
   gotools = callPackage ../development/tools/gotools { };
 
+  gomodifytags = callPackage ../development/tools/gomodifytags { };
+
   gogoclient = callPackage ../os-specific/linux/gogoclient { };
 
   nss_ldap = callPackage ../os-specific/linux/nss_ldap { };
@@ -16524,7 +16520,7 @@ with pkgs;
 
   mupdf = callPackage ../applications/misc/mupdf { };
 
-  diffpdf = callPackage ../applications/misc/diffpdf { };
+  diffpdf = libsForQt5.callPackage ../applications/misc/diffpdf { };
 
   diff-pdf = callPackage ../applications/misc/diff-pdf { wxGTK = wxGTK31; };
 
@@ -18202,6 +18198,8 @@ with pkgs;
 
   inherit (gnome3) yelp;
 
+  yokadi = python3Packages.callPackage ../applications/misc/yokadi {};
+
   yoshimi = callPackage ../applications/audio/yoshimi { };
 
   inherit (pythonPackages) youtube-dl;
@@ -19824,7 +19822,7 @@ with pkgs;
   faust1 = callPackage ../applications/audio/faust/faust1.nix { };
 
   faust2 = callPackage ../applications/audio/faust/faust2.nix {
-    llvm = llvm_4;
+    llvm = llvm_5;
   };
 
   faust2alqt = callPackage ../applications/audio/faust/faust2alqt.nix { };
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index cbb730363ff1..dda41afacea4 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10787,6 +10787,21 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  ParallelForkManager = buildPerlPackage rec {
+    name = "Parallel-ForkManager-1.19";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/Y/YA/YANICK/${name}.tar.gz";
+      sha256 = "f1de2e9875eeb77d65f80338905dedd522f3913822502982f805aa71cde5a472";
+    };
+    buildInputs = [ TestWarn ];
+    meta = {
+      homepage = https://github.com/dluxhu/perl-parallel-forkmanager;
+      description = "A simple parallel processing fork manager";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.rycee ];
+    };
+  };
+
   ParallelPrefork = buildPerlPackage {
     name = "Parallel-Prefork-0.17";
     src = fetchurl {