about summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2018-09-25 14:20:27 -0400
committerJohn Ericson <John.Ericson@Obsidian.Systems>2018-09-25 14:20:27 -0400
commitc701d6cb21e1e83a82ebdefe180f2d6233087f4a (patch)
tree3e7a7503cd7e84c8d2ee8aaffe264301fb591ebf /pkgs/development
parent6aa5f2db8f4c0df18364c8a70218a52a1b2c97cf (diff)
parent6cd28a468aec0005052ee01eaf8510735948a2dd (diff)
downloadnixlib-c701d6cb21e1e83a82ebdefe180f2d6233087f4a.tar
nixlib-c701d6cb21e1e83a82ebdefe180f2d6233087f4a.tar.gz
nixlib-c701d6cb21e1e83a82ebdefe180f2d6233087f4a.tar.bz2
nixlib-c701d6cb21e1e83a82ebdefe180f2d6233087f4a.tar.lz
nixlib-c701d6cb21e1e83a82ebdefe180f2d6233087f4a.tar.xz
nixlib-c701d6cb21e1e83a82ebdefe180f2d6233087f4a.tar.zst
nixlib-c701d6cb21e1e83a82ebdefe180f2d6233087f4a.zip
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/compilers/dotnet/sdk/default.nix6
-rw-r--r--pkgs/development/compilers/gcc/5/default.nix8
-rw-r--r--pkgs/development/compilers/gcc/6/default.nix8
-rw-r--r--pkgs/development/compilers/gcc/7/default.nix10
-rw-r--r--pkgs/development/compilers/gcc/8/default.nix10
-rw-r--r--pkgs/development/compilers/gcc/libgomp-dont-force-initial-exec.patch40
-rw-r--r--pkgs/development/compilers/ghc/7.10.3.nix4
-rw-r--r--pkgs/development/compilers/ghc/8.0.2.nix4
-rw-r--r--pkgs/development/compilers/ghc/8.2.2.nix4
-rw-r--r--pkgs/development/compilers/ghc/8.4.3.nix4
-rw-r--r--pkgs/development/compilers/ghc/8.6.1.nix4
-rw-r--r--pkgs/development/compilers/ghc/head.nix4
-rw-r--r--pkgs/development/compilers/ghcjs-ng/default.nix11
-rw-r--r--pkgs/development/compilers/go/1.11.nix1
-rw-r--r--pkgs/development/compilers/llvm/7/sanitizers-nongnu.patch151
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix4
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix4
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix4
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix11
-rw-r--r--pkgs/development/haskell-modules/configuration-ghcjs.nix2
-rw-r--r--pkgs/development/haskell-modules/configuration-hackage2nix.yaml83
-rw-r--r--pkgs/development/haskell-modules/hackage-packages.nix899
-rw-r--r--pkgs/development/libraries/boost/generic.nix16
-rw-r--r--pkgs/development/libraries/gtk-sharp/3.0.nix1
-rw-r--r--pkgs/development/libraries/herqq/default.nix1
-rw-r--r--pkgs/development/libraries/libcef/default.nix6
-rw-r--r--pkgs/development/libraries/libpfm/default.nix2
-rw-r--r--pkgs/development/libraries/libtins/default.nix4
-rw-r--r--pkgs/development/libraries/physics/lhapdf/default.nix7
-rw-r--r--pkgs/development/libraries/protobuf/3.6.nix6
-rw-r--r--pkgs/development/libraries/protobuf/generic-v3.nix2
-rw-r--r--pkgs/development/libraries/protobufc/1.3.nix4
-rw-r--r--pkgs/development/libraries/qgnomeplatform/default.nix37
-rw-r--r--pkgs/development/libraries/science/math/openblas/default.nix2
-rw-r--r--pkgs/development/libraries/virglrenderer/default.nix4
-rw-r--r--pkgs/development/python-modules/click-completion/default.nix23
-rw-r--r--pkgs/development/python-modules/click-didyoumean/default.nix22
-rw-r--r--pkgs/development/python-modules/elasticsearch-dsl/default.nix39
-rw-r--r--pkgs/development/python-modules/ldappool/default.nix4
-rw-r--r--pkgs/development/python-modules/py3exiv2/default.nix9
-rw-r--r--pkgs/development/python-modules/py3exiv2/setup.patch2
-rw-r--r--pkgs/development/python-modules/sharedmem/default.nix21
-rw-r--r--pkgs/development/python-modules/shellingham/default.nix19
-rw-r--r--pkgs/development/tools/azcopy/default.nix23
-rw-r--r--pkgs/development/tools/azcopy/deps.nix129
-rw-r--r--pkgs/development/tools/misc/circleci-cli/default.nix4
-rw-r--r--pkgs/development/tools/profiling/EZTrace/default.nix6
-rw-r--r--pkgs/development/tools/vagrant/Gemfile2
48 files changed, 1387 insertions, 284 deletions
diff --git a/pkgs/development/compilers/dotnet/sdk/default.nix b/pkgs/development/compilers/dotnet/sdk/default.nix
index 0e28e041cc5d..d1db965bc814 100644
--- a/pkgs/development/compilers/dotnet/sdk/default.nix
+++ b/pkgs/development/compilers/dotnet/sdk/default.nix
@@ -21,7 +21,11 @@ in
       sha512 = "639f9f68f225246d9cce798d72d011f65c7eda0d775914d1394df050bddf93e2886555f5eed85a75d6c72e9063a54d8aa053c64c326c683b94e9e0a0570e5654";
     };
 
-    unpackPhase = "tar xvzf $src";
+    unpackPhase = ''
+      mkdir src
+      cd src
+      tar xvzf $src
+    '';
 
     buildPhase = ''
       runHook preBuild
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index efd6ec072573..47c849d2dcc8 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -60,6 +60,7 @@ let version = "5.5.0";
       ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
       ++ optional noSysDirs ../no-sys-dirs.patch
       ++ optional langFortran ../gfortran-driving.patch
+      ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch
       ++ optional stdenv.hostPlatform.isMusl (fetchpatch {
         url = https://raw.githubusercontent.com/richfelker/musl-cross-make/e84b1bd1fc12a3def33111ca6df522cd6e5ec361/patches/gcc-5.3.0/0001-musl.diff;
         sha256 = "0pppbf8myi2kjhm3z3479ihn1cm60kycfv60gj8yy1bs0pl1qcfm";
@@ -329,7 +330,12 @@ stdenv.mkDerivation ({
       # On Illumos/Solaris GNU as is preferred
       "--with-gnu-as" "--without-gnu-ld"
     ]
-    ++ optional (targetPlatform == hostPlatform && targetPlatform.libc == "musl") "--disable-libsanitizer"
+    ++ optionals (targetPlatform == hostPlatform && targetPlatform.libc == "musl") [
+      "--disable-libsanitizer"
+      "--disable-symvers"
+      "libat_cv_have_ifunc=no"
+      "--disable-gnu-indirect-function"
+    ]
   ;
 
   targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index 4760d18a7d81..eeb57be97157 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -61,6 +61,7 @@ let version = "6.4.0";
       ++ optional langFortran ../gfortran-driving.patch
       ++ [ ../struct-ucontext.patch ../struct-sigaltstack.patch ] # glibc-2.26
       ++ optional langJava [ ../struct-ucontext-libjava.patch ] # glibc-2.26
+      ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch
       ;
 
     javaEcj = fetchurl {
@@ -334,7 +335,12 @@ stdenv.mkDerivation ({
       # On Illumos/Solaris GNU as is preferred
       "--with-gnu-as" "--without-gnu-ld"
     ]
-    ++ optional (targetPlatform == hostPlatform && targetPlatform.libc == "musl") "--disable-libsanitizer"
+    ++ optionals (targetPlatform == hostPlatform && targetPlatform.libc == "musl") [
+      "--disable-libsanitizer"
+      "--disable-symvers"
+      "libat_cv_have_ifunc=no"
+      "--disable-gnu-indirect-function"
+    ]
   ;
 
   targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index e2c686b7e7e8..59897ccff426 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -56,7 +56,8 @@ let version = "7.3.0";
         sha256 = "0mrvxsdwip2p3l17dscpc1x8vhdsciqw1z5q9i6p5g9yg1cqnmgs";
       })
       ++ optional langFortran ../gfortran-driving.patch
-      ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch;
+      ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch
+      ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch;
 
     /* Cross-gcc settings (build == host != target) */
     crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
@@ -288,7 +289,12 @@ stdenv.mkDerivation ({
       # On Illumos/Solaris GNU as is preferred
       "--with-gnu-as" "--without-gnu-ld"
     ]
-    ++ optional (targetPlatform == hostPlatform && targetPlatform.libc == "musl") "--disable-libsanitizer"
+    ++ optionals (targetPlatform == hostPlatform && targetPlatform.libc == "musl") [
+      "--disable-libsanitizer"
+      "--disable-symvers"
+      "libat_cv_have_ifunc=no"
+      "--disable-gnu-indirect-function"
+    ]
     ++ optional (targetPlatform.isAarch64) "--enable-fix-cortex-a53-843419"
   ;
 
diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
index 59d7653c52cd..7842110a2146 100644
--- a/pkgs/development/compilers/gcc/8/default.nix
+++ b/pkgs/development/compilers/gcc/8/default.nix
@@ -51,7 +51,8 @@ let version = "8.2.0";
         sha256 = ""; # TODO: uncomment and check hash when available.
       }) */
       ++ optional langFortran ../gfortran-driving.patch
-      ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch;
+      ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch
+      ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch;
 
     /* Cross-gcc settings (build == host != target) */
     crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
@@ -282,7 +283,12 @@ stdenv.mkDerivation ({
       # On Illumos/Solaris GNU as is preferred
       "--with-gnu-as" "--without-gnu-ld"
     ]
-    ++ optional (targetPlatform == hostPlatform && targetPlatform.libc == "musl") "--disable-libsanitizer"
+    ++ optionals (targetPlatform == hostPlatform && targetPlatform.libc == "musl") [
+      "--disable-libsanitizer"
+      "--disable-symvers"
+      "libat_cv_have_ifunc=no"
+      "--disable-gnu-indirect-function"
+    ]
   ;
 
   targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
diff --git a/pkgs/development/compilers/gcc/libgomp-dont-force-initial-exec.patch b/pkgs/development/compilers/gcc/libgomp-dont-force-initial-exec.patch
new file mode 100644
index 000000000000..afd1f7456d32
--- /dev/null
+++ b/pkgs/development/compilers/gcc/libgomp-dont-force-initial-exec.patch
@@ -0,0 +1,40 @@
+From 01c433f4788441c0963005b9d3fad5b2865e6651 Mon Sep 17 00:00:00 2001
+From: Will Dietz <w@wdtz.org>
+Date: Mon, 24 Sep 2018 19:57:50 -0500
+Subject: [PATCH] libgomp/configure.tgt: don't force initial-exec tls-model
+
+---
+ libgomp/configure.tgt | 17 -----------------
+ 1 file changed, 17 deletions(-)
+
+diff --git a/libgomp/configure.tgt b/libgomp/configure.tgt
+index 74d95a570c7..b608c55f0c1 100644
+--- a/libgomp/configure.tgt
++++ b/libgomp/configure.tgt
+@@ -10,23 +10,6 @@
+ #  XCFLAGS		Add extra compile flags to use.
+ #  XLDFLAGS		Add extra link flags to use.
+ 
+-# Optimize TLS usage by avoiding the overhead of dynamic allocation.
+-if test $gcc_cv_have_tls = yes ; then
+-  case "${target}" in
+-
+-    *-*-k*bsd*-gnu*)
+-	;;
+-
+-    *-*-linux* | *-*-gnu*)
+-	XCFLAGS="${XCFLAGS} -ftls-model=initial-exec"
+-	;;
+-
+-    *-*-rtems*)
+-	XCFLAGS="${XCFLAGS} -ftls-model=local-exec"
+-	;;
+-  esac
+-fi
+-
+ # Since we require POSIX threads, assume a POSIX system by default.
+ config_path="posix"
+ 
+-- 
+2.19.0
+
diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix
index 9c87d815b4a9..a4374a452402 100644
--- a/pkgs/development/compilers/ghc/7.10.3.nix
+++ b/pkgs/development/compilers/ghc/7.10.3.nix
@@ -1,7 +1,7 @@
 { stdenv, targetPackages
 
 # build-tools
-, bootPkgs, hscolour
+, bootPkgs
 , coreutils, fetchurl, perl
 , docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, libxml2, libxslt
 
@@ -142,7 +142,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42
-    ghc hscolour
+    ghc bootPkgs.hscolour
   ];
 
   # For building runtime libs
diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix
index 935d09b57446..0946db713783 100644
--- a/pkgs/development/compilers/ghc/8.0.2.nix
+++ b/pkgs/development/compilers/ghc/8.0.2.nix
@@ -1,7 +1,7 @@
 { stdenv, targetPackages
 
 # build-tools
-, bootPkgs, hscolour
+, bootPkgs
 , coreutils, fetchpatch, fetchurl, perl, sphinx
 
 , libiconv ? null, ncurses
@@ -144,7 +144,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     perl sphinx
-    ghc hscolour
+    ghc bootPkgs.hscolour
   ];
 
   # For building runtime libs
diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix
index cf448d8d849a..6a1914a9c2c8 100644
--- a/pkgs/development/compilers/ghc/8.2.2.nix
+++ b/pkgs/development/compilers/ghc/8.2.2.nix
@@ -1,7 +1,7 @@
 { stdenv, targetPackages
 
 # build-tools
-, bootPkgs, alex, happy, hscolour
+, bootPkgs
 , autoconf, autoreconfHook, automake, coreutils, fetchurl, fetchpatch, perl, python3, sphinx
 , runCommand
 
@@ -182,7 +182,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     autoconf autoreconfHook automake perl python3 sphinx
-    ghc alex happy hscolour
+    ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
   ];
 
   # For building runtime libs
diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix
index 365f401119da..8fba60d527fd 100644
--- a/pkgs/development/compilers/ghc/8.4.3.nix
+++ b/pkgs/development/compilers/ghc/8.4.3.nix
@@ -1,7 +1,7 @@
 { stdenv, targetPackages
 
 # build-tools
-, bootPkgs, alex, happy, hscolour
+, bootPkgs
 , autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4
 
 , libiconv ? null, ncurses
@@ -184,7 +184,7 @@ stdenv.mkDerivation (rec {
 
   nativeBuildInputs = [
     perl autoconf automake m4 python3
-    ghc alex happy hscolour
+    ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
   ];
 
   # For building runtime libs
diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.1.nix
index d4f2f931c31c..c12401f05778 100644
--- a/pkgs/development/compilers/ghc/8.6.1.nix
+++ b/pkgs/development/compilers/ghc/8.6.1.nix
@@ -1,7 +1,7 @@
 { stdenv, targetPackages
 
 # build-tools
-, bootPkgs, alex, happy, hscolour
+, bootPkgs
 , autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4
 
 , libiconv ? null, ncurses
@@ -169,7 +169,7 @@ stdenv.mkDerivation (rec {
 
   nativeBuildInputs = [
     perl autoconf automake m4 python3
-    ghc alex happy hscolour
+    ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
   ];
 
   # For building runtime libs
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index ee95bd0f6047..af5efbd7df8c 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -1,7 +1,7 @@
 { stdenv, targetPackages
 
 # build-tools
-, bootPkgs, alex, happy, hscolour
+, bootPkgs
 , autoconf, automake, coreutils, fetchgit, perl, python3, m4
 
 , libiconv ? null, ncurses
@@ -150,7 +150,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     perl autoconf automake m4 python3
-    ghc alex happy hscolour
+    ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
   ];
 
   # For building runtime libs
diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix
index 5db2777c8bb0..92211042acd9 100644
--- a/pkgs/development/compilers/ghcjs-ng/default.nix
+++ b/pkgs/development/compilers/ghcjs-ng/default.nix
@@ -4,8 +4,6 @@
 , ghcjsSrcJson ? null
 , ghcjsSrc ? fetchgit (builtins.fromJSON (builtins.readFile ghcjsSrcJson))
 , bootPkgs
-, alex
-, happy
 , stage0
 , haskellLib
 , cabal-install
@@ -24,8 +22,8 @@
 let
   passthru = {
     configuredSrc = callPackage ./configured-ghcjs-src.nix {
-      inherit ghcjsSrc alex happy;
-      inherit (bootPkgs) ghc;
+      inherit ghcjsSrc;
+      inherit (bootPkgs) ghc alex happy;
     };
     genStage0 = callPackage ./mk-stage0.nix { inherit (passthru) configuredSrc; };
     bootPkgs = bootPkgs.extend (lib.foldr lib.composeExtensions (_:_:{}) [
@@ -34,7 +32,10 @@ let
         inherit (self) callPackage;
       })
 
-      (callPackage ./common-overrides.nix { inherit haskellLib alex happy; })
+      (callPackage ./common-overrides.nix {
+        inherit haskellLib;
+        inherit (bootPkgs) alex happy;
+      })
       ghcjsDepOverrides
     ]);
 
diff --git a/pkgs/development/compilers/go/1.11.nix b/pkgs/development/compilers/go/1.11.nix
index e4872597e79c..56d363f1015f 100644
--- a/pkgs/development/compilers/go/1.11.nix
+++ b/pkgs/development/compilers/go/1.11.nix
@@ -178,6 +178,7 @@ stdenv.mkDerivation rec {
 
   preFixup = ''
     rm -r $out/share/go/pkg/bootstrap
+    rm -r $out/share/go/pkg/obj
     ln -s $out/share/go/bin $out/bin
   '';
 
diff --git a/pkgs/development/compilers/llvm/7/sanitizers-nongnu.patch b/pkgs/development/compilers/llvm/7/sanitizers-nongnu.patch
index 6266eb1958d1..1f2ac97818eb 100644
--- a/pkgs/development/compilers/llvm/7/sanitizers-nongnu.patch
+++ b/pkgs/development/compilers/llvm/7/sanitizers-nongnu.patch
@@ -1,7 +1,7 @@
-From 7b4b3333a2718628b1d510ec1d8438ad67308299 Mon Sep 17 00:00:00 2001
+From f7a253f8f85d0f49df6b73996737a3e84ac64236 Mon Sep 17 00:00:00 2001
 From: Will Dietz <w@wdtz.org>
-Date: Fri, 29 Jun 2018 09:48:59 -0500
-Subject: [PATCH] Ported to 6.0, taken from gentoo-musl project.
+Date: Mon, 24 Sep 2018 11:17:25 -0500
+Subject: [PATCH] Ported to 7.0, taken from gentoo-musl project.
 
 ------
 Ported to compiler-rt-sanitizers-5.0.0. Taken from
@@ -13,7 +13,7 @@ Taken from gentoo-musl project, with a few additional minor fixes.
 ---
  lib/asan/asan_linux.cc                        |  4 +-
  lib/interception/interception_linux.cc        |  2 +-
- lib/interception/interception_linux.h         |  3 +-
+ lib/interception/interception_linux.h         |  2 +-
  lib/msan/msan_linux.cc                        |  2 +-
  lib/sanitizer_common/sanitizer_allocator.cc   |  2 +-
  .../sanitizer_common_interceptors_ioctl.inc   |  4 +-
@@ -24,7 +24,7 @@ Taken from gentoo-musl project, with a few additional minor fixes.
  .../sanitizer_platform_interceptors.h         |  4 +-
  .../sanitizer_platform_limits_posix.cc        | 37 +++++++++++--------
  lib/tsan/rtl/tsan_platform_linux.cc           |  2 +-
- 13 files changed, 51 insertions(+), 35 deletions(-)
+ 13 files changed, 51 insertions(+), 34 deletions(-)
 
 diff --git a/lib/asan/asan_linux.cc b/lib/asan/asan_linux.cc
 index 625f32d40..73cf77aca 100644
@@ -49,34 +49,33 @@ index 625f32d40..73cf77aca 100644
  void AsanCheckDynamicRTPrereqs() {}
  void AsanCheckIncompatibleRT() {}
 diff --git a/lib/interception/interception_linux.cc b/lib/interception/interception_linux.cc
-index c991550a4..2b706418b 100644
+index 26bfcd8f6..529b234f7 100644
 --- a/lib/interception/interception_linux.cc
 +++ b/lib/interception/interception_linux.cc
 @@ -43,7 +43,7 @@ bool GetRealFunctionAddress(const char *func_name, uptr *func_addr,
  }
  
  // Android and Solaris do not have dlvsym
--#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS
-+#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_NONGNU
+-#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD
++#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
  void *GetFuncAddrVer(const char *func_name, const char *ver) {
    return dlvsym(RTLD_NEXT, func_name, ver);
  }
 diff --git a/lib/interception/interception_linux.h b/lib/interception/interception_linux.h
-index 98fe51b85..c13302b98 100644
+index 942c25609..24a4d5080 100644
 --- a/lib/interception/interception_linux.h
 +++ b/lib/interception/interception_linux.h
-@@ -35,8 +35,7 @@ void *GetFuncAddrVer(const char *func_name, const char *ver);
-       (::__interception::uptr) & (func),                                   \
+@@ -36,7 +36,7 @@ void *GetFuncAddrVer(const char *func_name, const char *ver);
        (::__interception::uptr) & WRAP(func))
  
--// Android and Solaris do not have dlvsym
--#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS
-+#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_NONGNU
+ // Android,  Solaris and OpenBSD do not have dlvsym
+-#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD
++#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
  #define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \
    (::__interception::real_##func = (func##_f)(                \
         unsigned long)::__interception::GetFuncAddrVer(#func, symver))
 diff --git a/lib/msan/msan_linux.cc b/lib/msan/msan_linux.cc
-index 4e6321fcb..4d50feb82 100644
+index 385a650c4..6e30a8ce9 100644
 --- a/lib/msan/msan_linux.cc
 +++ b/lib/msan/msan_linux.cc
 @@ -13,7 +13,7 @@
@@ -87,12 +86,12 @@ index 4e6321fcb..4d50feb82 100644
 +#if SANITIZER_FREEBSD || (SANITIZER_LINUX && !SANITIZER_NONGNU) || SANITIZER_NETBSD
  
  #include "msan.h"
- #include "msan_thread.h"
+ #include "msan_report.h"
 diff --git a/lib/sanitizer_common/sanitizer_allocator.cc b/lib/sanitizer_common/sanitizer_allocator.cc
-index fc4f7a75a..76cf4f769 100644
+index 6bfd5e5ee..048f6154f 100644
 --- a/lib/sanitizer_common/sanitizer_allocator.cc
 +++ b/lib/sanitizer_common/sanitizer_allocator.cc
-@@ -23,7 +23,7 @@ namespace __sanitizer {
+@@ -27,7 +27,7 @@ const char *SecondaryAllocatorName = "LargeMmapAllocator";
  
  // ThreadSanitizer for Go uses libc malloc/free.
  #if SANITIZER_GO || defined(SANITIZER_USE_MALLOC)
@@ -102,10 +101,10 @@ index fc4f7a75a..76cf4f769 100644
  #  if !SANITIZER_GO
  extern "C" void *__libc_memalign(uptr alignment, uptr size);
 diff --git a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
-index 24e7548a5..20259b1d6 100644
+index 2d633c173..b6eb23116 100644
 --- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
 +++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
-@@ -102,7 +102,7 @@ static void ioctl_table_fill() {
+@@ -104,7 +104,7 @@ static void ioctl_table_fill() {
    _(SIOCGETVIFCNT, WRITE, struct_sioc_vif_req_sz);
  #endif
  
@@ -114,7 +113,7 @@ index 24e7548a5..20259b1d6 100644
    // Conflicting request ids.
    // _(CDROMAUDIOBUFSIZ, NONE, 0);
    // _(SNDCTL_TMR_CONTINUE, NONE, 0);
-@@ -363,7 +363,7 @@ static void ioctl_table_fill() {
+@@ -365,7 +365,7 @@ static void ioctl_table_fill() {
    _(VT_WAITACTIVE, NONE, 0);
  #endif
  
@@ -137,59 +136,59 @@ index 469c8eb7e..24f87867d 100644
                         void *old_rlim) {
    if (new_rlim) PRE_READ(new_rlim, struct_rlimit64_sz);
 diff --git a/lib/sanitizer_common/sanitizer_linux.cc b/lib/sanitizer_common/sanitizer_linux.cc
-index 6c83e8db4..542c4fe64 100644
+index 96d6c1eff..9e2b7fb9d 100644
 --- a/lib/sanitizer_common/sanitizer_linux.cc
 +++ b/lib/sanitizer_common/sanitizer_linux.cc
-@@ -522,13 +522,13 @@ const char *GetEnv(const char *name) {
+@@ -541,13 +541,13 @@ const char *GetEnv(const char *name) {
  #endif
  }
  
--#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD
-+#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_NONGNU
+-#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_OPENBSD
++#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
  extern "C" {
-   SANITIZER_WEAK_ATTRIBUTE extern void *__libc_stack_end;
+ SANITIZER_WEAK_ATTRIBUTE extern void *__libc_stack_end;
  }
  #endif
  
--#if !SANITIZER_GO && !SANITIZER_FREEBSD && !SANITIZER_NETBSD
-+#if (!SANITIZER_GO || SANITIZER_NONGNU) && !SANITIZER_FREEBSD && !SANITIZER_NETBSD
+-#if !SANITIZER_GO && !SANITIZER_FREEBSD && !SANITIZER_NETBSD &&                \
++#if (!SANITIZER_GO || SANITIZER_NONGNU) && !SANITIZER_FREEBSD && !SANITIZER_NETBSD &&                \
+     !SANITIZER_OPENBSD
  static void ReadNullSepFileToArray(const char *path, char ***arr,
                                     int arr_size) {
-   char *buff;
-@@ -569,6 +569,10 @@ static void GetArgsAndEnv(char ***argv, char ***envp) {
+@@ -590,6 +590,10 @@ static void GetArgsAndEnv(char ***argv, char ***envp) {
  #elif SANITIZER_NETBSD
    *argv = __ps_strings->ps_argvstr;
-   *argv = __ps_strings->ps_envstr;
+   *envp = __ps_strings->ps_envstr;
 +#elif SANITIZER_NONGNU
 +    static const int kMaxArgv = 2000, kMaxEnvp = 2000;
 +    ReadNullSepFileToArray("/proc/self/cmdline", argv, kMaxArgv);
 +    ReadNullSepFileToArray("/proc/self/environ", envp, kMaxEnvp);
- #else
+ #else // SANITIZER_FREEBSD
  #if !SANITIZER_GO
    if (&__libc_stack_end) {
 diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
-index 56fdfc870..a932d5db1 100644
+index 4962ff832..438f94dbe 100644
 --- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc
 +++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
-@@ -174,7 +174,7 @@ bool SanitizerGetThreadName(char *name, int max_len) {
+@@ -179,7 +179,7 @@ __attribute__((unused)) static bool GetLibcVersion(int *major, int *minor,
  }
  
- #if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && \
--    !SANITIZER_NETBSD && !SANITIZER_SOLARIS
-+    !SANITIZER_NETBSD && !SANITIZER_SOLARIS && !SANITIZER_NONGNU
+ #if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO &&               \
+-    !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_SOLARIS
++    !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_SOLARIS && !SANITIZER_NONGNU
  static uptr g_tls_size;
  
  #ifdef __i386__
-@@ -207,7 +207,7 @@ void InitTlsSize() { }
- 
- #if (defined(__x86_64__) || defined(__i386__) || defined(__mips__) \
-     || defined(__aarch64__) || defined(__powerpc64__) || defined(__s390__) \
--    || defined(__arm__)) && SANITIZER_LINUX && !SANITIZER_ANDROID
-+    || defined(__arm__)) && SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+@@ -261,7 +261,7 @@ void InitTlsSize() { }
+ #if (defined(__x86_64__) || defined(__i386__) || defined(__mips__) ||          \
+      defined(__aarch64__) || defined(__powerpc64__) || defined(__s390__) ||    \
+      defined(__arm__)) &&                                                      \
+-    SANITIZER_LINUX && !SANITIZER_ANDROID
++    SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
  // sizeof(struct pthread) from glibc.
- static atomic_uintptr_t kThreadDescriptorSize;
+ static atomic_uintptr_t thread_descriptor_size;
  
-@@ -391,7 +391,7 @@ int GetSizeFromHdr(struct dl_phdr_info *info, size_t size, void *data) {
+@@ -426,7 +426,7 @@ int GetSizeFromHdr(struct dl_phdr_info *info, size_t size, void *data) {
  
  #if !SANITIZER_GO
  static void GetTls(uptr *addr, uptr *size) {
@@ -198,29 +197,29 @@ index 56fdfc870..a932d5db1 100644
  # if defined(__x86_64__) || defined(__i386__) || defined(__s390__)
    *addr = ThreadSelf();
    *size = GetTlsSize();
-@@ -432,7 +432,7 @@ static void GetTls(uptr *addr, uptr *size) {
-       *addr = (uptr)tcb->tcb_dtv[1];
-     }
-   }
+@@ -470,7 +470,7 @@ static void GetTls(uptr *addr, uptr *size) {
+ #elif SANITIZER_OPENBSD
+   *addr = 0;
+   *size = 0;
 -#elif SANITIZER_ANDROID
 +#elif SANITIZER_ANDROID || SANITIZER_NONGNU
    *addr = 0;
    *size = 0;
  #elif SANITIZER_SOLARIS
-@@ -448,7 +448,7 @@ static void GetTls(uptr *addr, uptr *size) {
+@@ -486,7 +486,7 @@ static void GetTls(uptr *addr, uptr *size) {
  #if !SANITIZER_GO
  uptr GetTlsSize() {
- #if SANITIZER_FREEBSD || SANITIZER_ANDROID || SANITIZER_NETBSD || \
--    SANITIZER_SOLARIS
-+    SANITIZER_SOLARIS || SANITIZER_NONGNU
+ #if SANITIZER_FREEBSD || SANITIZER_ANDROID || SANITIZER_NETBSD ||              \
+-    SANITIZER_OPENBSD || SANITIZER_SOLARIS
++    SANITIZER_OPENBSD || SANITIZER_SOLARIS || SANITIZER_NONGNU
    uptr addr, size;
    GetTls(&addr, &size);
    return size;
 diff --git a/lib/sanitizer_common/sanitizer_platform.h b/lib/sanitizer_common/sanitizer_platform.h
-index 334903c26..fc2afac2c 100644
+index d81e25580..e10680ac8 100644
 --- a/lib/sanitizer_common/sanitizer_platform.h
 +++ b/lib/sanitizer_common/sanitizer_platform.h
-@@ -195,6 +195,12 @@
+@@ -208,6 +208,12 @@
  # define SANITIZER_SOLARIS32 0
  #endif
  
@@ -230,14 +229,14 @@ index 334903c26..fc2afac2c 100644
 +# define SANITIZER_NONGNU 0
 +#endif
 +
- // By default we allow to use SizeClassAllocator64 on 64-bit platform.
- // But in some cases (e.g. AArch64's 39-bit address space) SizeClassAllocator64
- // does not work well and we need to fallback to SizeClassAllocator32.
+ #if defined(__myriad2__)
+ # define SANITIZER_MYRIAD2 1
+ #else
 diff --git a/lib/sanitizer_common/sanitizer_platform_interceptors.h b/lib/sanitizer_common/sanitizer_platform_interceptors.h
-index b99ac4480..628d226a1 100644
+index f95539a73..6c53b3415 100644
 --- a/lib/sanitizer_common/sanitizer_platform_interceptors.h
 +++ b/lib/sanitizer_common/sanitizer_platform_interceptors.h
-@@ -38,7 +38,7 @@
+@@ -39,7 +39,7 @@
  # include "sanitizer_platform_limits_solaris.h"
  #endif
  
@@ -246,17 +245,17 @@ index b99ac4480..628d226a1 100644
  # define SI_LINUX_NOT_ANDROID 1
  #else
  # define SI_LINUX_NOT_ANDROID 0
-@@ -291,7 +291,7 @@
-   (SI_FREEBSD || SI_MAC || SI_LINUX_NOT_ANDROID)
+@@ -322,7 +322,7 @@
  #define SANITIZER_INTERCEPT_ETHER_R (SI_FREEBSD || SI_LINUX_NOT_ANDROID)
- #define SANITIZER_INTERCEPT_SHMCTL                       \
--  (SI_NETBSD || SI_SOLARIS || ((SI_FREEBSD || SI_LINUX_NOT_ANDROID) && \
-+  (SI_NETBSD || SI_SOLARIS || ((SI_FREEBSD || SI_LINUX_NOT_ANDROID || SANITIZER_NONGNU) && \
-                  SANITIZER_WORDSIZE == 64))  // NOLINT
+ #define SANITIZER_INTERCEPT_SHMCTL          \
+   (SI_NETBSD || SI_OPENBSD || SI_SOLARIS || \
+-  ((SI_FREEBSD || SI_LINUX_NOT_ANDROID) && \
++  ((SI_FREEBSD || SI_LINUX_NOT_ANDROID || SANITIZER_NONGNU) && \
+     SANITIZER_WORDSIZE == 64))  // NOLINT
  #define SANITIZER_INTERCEPT_RANDOM_R SI_LINUX_NOT_ANDROID
  #define SANITIZER_INTERCEPT_PTHREAD_ATTR_GET SI_POSIX
 diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-index feb7bad6f..4e89ab2a6 100644
+index 54da635d7..2f6ff69c3 100644
 --- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
 +++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
 @@ -14,6 +14,9 @@
@@ -357,9 +356,9 @@ index feb7bad6f..4e89ab2a6 100644
  CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type);
 +#endif
  
- COMPILER_CHECK(sizeof(__sanitizer_dirent) <= sizeof(dirent));
- CHECK_SIZE_AND_OFFSET(dirent, d_ino);
-@@ -1138,7 +1145,7 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_passno);
+ #ifndef __GLIBC_PREREQ
+ #define __GLIBC_PREREQ(x, y) 0
+@@ -1145,7 +1152,7 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_passno);
  
  CHECK_TYPE_SIZE(ether_addr);
  
@@ -368,7 +367,7 @@ index feb7bad6f..4e89ab2a6 100644
  CHECK_TYPE_SIZE(ipc_perm);
  # if SANITIZER_FREEBSD
  CHECK_SIZE_AND_OFFSET(ipc_perm, key);
-@@ -1199,7 +1206,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr);
+@@ -1206,7 +1213,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr);
  CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_data);
  #endif
  
@@ -377,7 +376,7 @@ index feb7bad6f..4e89ab2a6 100644
  COMPILER_CHECK(sizeof(__sanitizer_mallinfo) == sizeof(struct mallinfo));
  #endif
  
-@@ -1249,7 +1256,7 @@ COMPILER_CHECK(__sanitizer_XDR_DECODE == XDR_DECODE);
+@@ -1256,7 +1263,7 @@ COMPILER_CHECK(__sanitizer_XDR_DECODE == XDR_DECODE);
  COMPILER_CHECK(__sanitizer_XDR_FREE == XDR_FREE);
  #endif
  
@@ -386,7 +385,7 @@ index feb7bad6f..4e89ab2a6 100644
  COMPILER_CHECK(sizeof(__sanitizer_FILE) <= sizeof(FILE));
  CHECK_SIZE_AND_OFFSET(FILE, _flags);
  CHECK_SIZE_AND_OFFSET(FILE, _IO_read_ptr);
-@@ -1268,7 +1275,7 @@ CHECK_SIZE_AND_OFFSET(FILE, _chain);
+@@ -1275,7 +1282,7 @@ CHECK_SIZE_AND_OFFSET(FILE, _chain);
  CHECK_SIZE_AND_OFFSET(FILE, _fileno);
  #endif
  
@@ -396,10 +395,10 @@ index feb7bad6f..4e89ab2a6 100644
  CHECK_SIZE_AND_OFFSET(_obstack_chunk, limit);
  CHECK_SIZE_AND_OFFSET(_obstack_chunk, prev);
 diff --git a/lib/tsan/rtl/tsan_platform_linux.cc b/lib/tsan/rtl/tsan_platform_linux.cc
-index e14d5f575..389a3bc88 100644
+index de989b780..51a97b554 100644
 --- a/lib/tsan/rtl/tsan_platform_linux.cc
 +++ b/lib/tsan/rtl/tsan_platform_linux.cc
-@@ -285,7 +285,7 @@ void InitializePlatform() {
+@@ -294,7 +294,7 @@ void InitializePlatform() {
  // This is required to properly "close" the fds, because we do not see internal
  // closes within glibc. The code is a pure hack.
  int ExtractResolvFDs(void *state, int *fds, int nfd) {
@@ -409,5 +408,5 @@ index e14d5f575..389a3bc88 100644
    struct __res_state *statp = (struct __res_state*)state;
    for (int i = 0; i < MAXNS && cnt < nfd; i++) {
 -- 
-2.18.0
+2.19.0
 
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 5684d14caddf..85efecc8ed3b 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -40,8 +40,8 @@ self: super: {
   mtl = self.mtl_2_2_2;
   parsec = self.parsec_3_1_13_0;
   parsec_3_1_13_0 = addBuildDepends super.parsec_3_1_13_0 [self.fail self.semigroups];
-  stm = self.stm_2_4_5_1;
-  text = self.text_1_2_3_0;
+  stm = self.stm_2_5_0_0;
+  text = self.text_1_2_3_1;
 
   # Build jailbreak-cabal with the latest version of Cabal.
   jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_24_2_0; };
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
index a28682004239..e0d2753a5849 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -39,8 +39,8 @@ self: super: {
   # These are now core libraries in GHC 8.4.x.
   mtl = self.mtl_2_2_2;
   parsec = self.parsec_3_1_13_0;
-  stm = self.stm_2_4_5_1;
-  text = self.text_1_2_3_0;
+  stm = self.stm_2_5_0_0;
+  text = self.text_1_2_3_1;
 
   # https://github.com/bmillwood/applicative-quoters/issues/6
   applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch {
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index af96a7425d1c..7a5b78ba74c6 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -39,8 +39,8 @@ self: super: {
   # These are now core libraries in GHC 8.4.x.
   mtl = self.mtl_2_2_2;
   parsec = self.parsec_3_1_13_0;
-  stm = self.stm_2_4_5_1;
-  text = self.text_1_2_3_0;
+  stm = self.stm_2_5_0_0;
+  text = self.text_1_2_3_1;
 
   # Make sure we can still build Cabal 1.x.
   Cabal_1_24_2_0 = overrideCabal super.Cabal_1_24_2_0 (drv: {
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index 42712df3295b..b49b9cea60bb 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -44,9 +44,16 @@ self: super: {
   # Use to be a core-library, but no longer is since GHC 8.4.x.
   hoopl = self.hoopl_3_10_2_2;
 
-  # lts-12.x versions do not compile.
+  # LTS-12.x versions do not compile.
+  contravariant = self.contravariant_1_5;
+  doctest = self.doctest_0_16_0_1;
+  hspec-core = self.hspec-core_2_5_7;
+  hspec-core_2_5_7 = super.hspec-core_2_5_7.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_12_4; });
+  hspec-meta = self.hspec-meta_2_5_6;
+  hspec-meta_2_5_6 = super.hspec-meta_2_5_6.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_12_4; });
   primitive = self.primitive_0_6_4_0;
   tagged = self.tagged_0_8_6;
+  unordered-containers = dontCheck super.unordered-containers;
 
   # Over-specified constraints.
   async = doJailbreak super.async;                           # base >=4.3 && <4.12, stm >=2.2 && <2.5
@@ -54,6 +61,8 @@ self: super: {
   hashable = doJailbreak super.hashable;                     # base >=4.4 && <4.1
   hashable-time = doJailbreak super.hashable-time;           # base >=4.7 && <4.12
   integer-logarithms = doJailbreak super.integer-logarithms; # base >=4.3 && <4.12
+  optparse-applicative = doJailbreak super.optparse-applicative;   # https://github.com/pcapriotti/optparse-applicative/issues/319
+  polyparse = markBrokenVersion "1.12" super.polyparse;      # version 1.12 fails to compile
   tar = doJailbreak super.tar;                               # containers >=0.2 && <0.6
   test-framework = doJailbreak super.test-framework;         # containers >=0.1 && <0.6
 
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index 7e8bc1a1e8e3..489f363db6a0 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -25,7 +25,7 @@ self: super:
 
   # GHCJS does not ship with the same core packages as GHC.
   # https://github.com/ghcjs/ghcjs/issues/676
-  stm = self.stm_2_4_5_1;
+  stm = self.stm_2_5_0_0;
   ghc-compact = self.ghc-compact_0_1_0_0;
 
   network = addBuildTools super.network (pkgs.lib.optional pkgs.buildPlatform.isDarwin pkgs.buildPackages.darwin.libiconv);
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 7f9e31432892..5d7173bf44a4 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2806,6 +2806,7 @@ dont-distribute-packages:
   anticiv:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   antigate:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   antimirov:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  antiope-contract:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   antiope-core:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   antiope-dynamodb:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   antiope-messages:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2850,6 +2851,7 @@ dont-distribute-packages:
   ApproxFun-hs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   arb-fft:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   arbb-vm:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  arbor-postgres:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   arbtt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   archiver:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   archlinux-web:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2878,6 +2880,7 @@ dont-distribute-packages:
   ArrowVHDL:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   artery:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ascii-flatten:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ascii-string:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ascii-table:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ascii-vector-avc:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   ascii85-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2896,6 +2899,7 @@ dont-distribute-packages:
   ast-monad:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   astrds:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   astview:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  async-combinators:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   async-dejafu:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   async-manager:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   asynchronous-exceptions:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2935,6 +2939,7 @@ dont-distribute-packages:
   augur:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   aur-api:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   aur:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aura:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Aurochs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   authenticate-ldap:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   authoring:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2976,6 +2981,7 @@ dont-distribute-packages:
   aws-sign4:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-sns:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  axel:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   axiom:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   azubi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   azure-service-api:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3184,6 +3190,7 @@ dont-distribute-packages:
   Blueprint:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   bluetile:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   bluetileutils:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  blunk-hask-tests:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   blunt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   BNFC-meta:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   BNFC:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3208,10 +3215,12 @@ dont-distribute-packages:
   bowntz:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   braid:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   brain-bleep:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  brainheck:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Bravo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   breakout:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   breve:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   brians-brain:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  brick-skylighting:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bricks-internal-test:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   bricks-internal:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bricks-parsec:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3219,6 +3228,10 @@ dont-distribute-packages:
   bricks-syntax:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   bricks:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   brillig:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  brittany:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  broadcast-chan-conduit:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  broadcast-chan-pipes:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  broadcast-chan-tests:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   broccoli:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   broker-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   bronyradiogermany-streaming:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3231,6 +3244,7 @@ dont-distribute-packages:
   buffer-builder-aeson:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   buffer:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   buffon:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bugsnag-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   bugzilla:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   build:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   buildable:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3335,6 +3349,7 @@ dont-distribute-packages:
   cao:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   cap:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Capabilities:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  capnp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   capped-list:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   capri:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   car-pool:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3619,6 +3634,7 @@ dont-distribute-packages:
   concrete-haskell-autogen:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   concrete-haskell:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   concrete-typerep:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  concurrency-benchmarks:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   concurrent-buffer:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   Concurrent-Cache:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   concurrent-dns-cache:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3962,6 +3978,7 @@ dont-distribute-packages:
   delude:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   demarcate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   denominate:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dense-int-set:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   dependent-monoidal-map:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   dependent-state:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   dependent-sum-aeson-orphans:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4040,6 +4057,7 @@ dont-distribute-packages:
   dirfiles:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   discogs-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   discord-gateway:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  discord-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   discord-hs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   discord-rest:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   discord-types:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4087,6 +4105,7 @@ dont-distribute-packages:
   doc-review:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   doccheck:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   docidx:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  docker-build-cacher:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   doctest-discover-configurator:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   doctest-driver-gen:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   DocTest:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4219,6 +4238,7 @@ dont-distribute-packages:
   email-postmark:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   email-validator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   email:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  emailaddress:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   emailparse:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   embeddock-example:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   embeddock:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4347,6 +4367,7 @@ dont-distribute-packages:
   extract-dependencies:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   extractelf:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ez-couch:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  f-ree-hack-cheats-free-v-bucks-generator:       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Facebook-Password-Hacker-Online-Latest-Version: [ i686-linux, x86_64-linux, x86_64-darwin ]
   faceted:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   factory:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4509,6 +4530,7 @@ dont-distribute-packages:
   foldl-transduce:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   folds-common:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   follow-file:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  follow:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   follower:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   foma:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   font-opengl-basic4x6:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4548,6 +4570,7 @@ dont-distribute-packages:
   Fractaler:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   fractals:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   frag:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Frames-beam:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Frames:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   franchise:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Frank:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4562,6 +4585,8 @@ dont-distribute-packages:
   free-theorems-seq:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   free-theorems-webui:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   free-theorems:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  free-v-bucks-generator-no-survey:               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  free-v-bucks-generator-ps4-no-survey:           [ i686-linux, x86_64-linux, x86_64-darwin ]
   free-vector-spaces:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   freekick2:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   freelude:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4664,6 +4689,7 @@ dont-distribute-packages:
   generic-accessors:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   generic-binary:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   generic-church:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  generic-data:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   generic-enum:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   generic-lens-labels:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   generic-lens:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4806,8 +4832,12 @@ dont-distribute-packages:
   glome-hs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   GlomeTrace:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   GlomeView:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gloss-algorithms:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   gloss-banana:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   gloss-devil:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gloss-examples:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gloss-game:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gloss-juicy:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gloss-sodium:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   glpk-hs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   glue-common:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5052,6 +5082,8 @@ dont-distribute-packages:
   Grow:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   growler:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   GrowlNotify:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  grpc-api-etcd:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  grpc-etcd-client:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   gruff-examples:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   gruff:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   gsl-random-fu:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5296,11 +5328,13 @@ dont-distribute-packages:
   haskell-names:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-neo4j-client:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-openflow:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-overridez:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-packages:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-pdf-presenter:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-platform-test:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-player:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-plot:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-postal:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-read-editor:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-reflect:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-rules:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5355,11 +5389,13 @@ dont-distribute-packages:
   haskheap:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskhol-core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskmon:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskoin-bitcoind:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskoin-core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskoin-crypto:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskoin-node:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskoin-protocol:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskoin-script:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskoin-store:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskoin-util:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskoin-wallet:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskoin:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5469,6 +5505,8 @@ dont-distribute-packages:
   hdr-histogram:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   HDRUtils:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   headergen:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  heatitup-complete:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  heatitup:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   heavy-logger-amazon:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   heavy-logger-instances:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   heavy-logger:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5671,6 +5709,7 @@ dont-distribute-packages:
   hmatrix-static:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-sundials:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-syntax:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hmatrix-tests:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmeap-utils:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmeap:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmenu:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5977,6 +6016,7 @@ dont-distribute-packages:
   html-kure:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   html-rules:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   html-tokenizer:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  htoml-megaparsec:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hts:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   htsn-import:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   htsn:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6243,6 +6283,7 @@ dont-distribute-packages:
   isobmff-builder:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   isohunt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   isotope:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  itcli:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   itemfield:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   iter-stats:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   iteratee-compress:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6288,6 +6329,7 @@ dont-distribute-packages:
   jenga:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   jenkinsPlugins2nix:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   jespresso:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jinquantities:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   jml-web-service:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   jobqueue:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   join-api:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6425,6 +6467,7 @@ dont-distribute-packages:
   krpc:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   KSP:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   ktx:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Kulitta:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   kure-your-boilerplate:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   kure:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   KyotoCabinet:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6500,6 +6543,7 @@ dont-distribute-packages:
   language-ninja:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-oberon:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-objc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  language-ocaml:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-openscad:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-pig:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-puppet:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6584,6 +6628,7 @@ dont-distribute-packages:
   liblinear-enumerator:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   libltdl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   libmolude:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  libnix:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   liboath-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   liboleg:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   libpafe:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6596,6 +6641,7 @@ dont-distribute-packages:
   libxml-enumerator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   libxslt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   licensor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lifted-base-tf:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   lifted-protolude:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   lifter:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ligature:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6739,6 +6785,7 @@ dont-distribute-packages:
   ls-usb:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   lscabal:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   LslPlus:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lsp-test:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   lsystem:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ltext:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ltk:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6908,6 +6955,7 @@ dont-distribute-packages:
   MHask:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   mi:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   Michelangelo:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  miconix-test:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   microaeson:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   microformats2-types:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   microgroove:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6942,11 +6990,15 @@ dont-distribute-packages:
   missing-py2:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   MissingPy:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   mixed-strategies:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mixpanel-client:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   mkbndl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   mkcabal:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ml-w:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   mlist:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   mltool:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mmark-cli:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mmark-ext:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mmark:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   mmtf:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   mmtl-base:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   mmtl:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7351,6 +7403,7 @@ dont-distribute-packages:
   opaleye-classy:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   opaleye-sqlite:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   opaleye-trans:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  opaleye:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   open-haddock:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   open-pandoc:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   open-signals:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7378,6 +7431,7 @@ dont-distribute-packages:
   opensoundcontrol-ht:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   openssh-github-keys:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   opentheory-char:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  opentok:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   opentype:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenVG:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenVGRaw:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7385,6 +7439,7 @@ dont-distribute-packages:
   Operads:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   operational-extra:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   opml-conduit:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  optima:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   optimal-blocks:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   optimusprime:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   optional:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7410,6 +7465,7 @@ dont-distribute-packages:
   OrPatterns:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   osc:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   oscpacking:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Oslo-Vectize:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   osm-conduit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   osm-download:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   OSM:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7542,6 +7598,7 @@ dont-distribute-packages:
   perhaps:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   periodic:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   perm:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  permutations:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   permute:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   PermuteEffects:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   persist2er:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7630,6 +7687,7 @@ dont-distribute-packages:
   pitchtrack:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pivotal-tracker:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   pixelated-avatar-generator:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  piyo:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   pkcs10:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   pkcs7:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   pkggraph:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7638,6 +7696,7 @@ dont-distribute-packages:
   plan-b:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   planar-graph:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   planb-token-introspection:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  planet-mitchell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   plankton:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   plat:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   platinum-parsing:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7751,6 +7810,7 @@ dont-distribute-packages:
   pretty-sop:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   prettyprinter-vty:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   preview:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  prim-instances:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   primes-type:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   primesieve:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   primitive-checked:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7810,6 +7870,8 @@ dont-distribute-packages:
   prosper:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   proto-lens-combinators:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   proto-lens-descriptors:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  proto-lens-runtime:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  proto-lens-setup:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   protobuf-native:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   protocol-buffers-descriptor-fork:               [ i686-linux, x86_64-linux, x86_64-darwin ]
   protocol-buffers-fork:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7841,6 +7903,7 @@ dont-distribute-packages:
   pure-io:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   pure-priority-queue-tests:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   pure-priority-queue:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  purescript-iso:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   purescript-tsd-gen:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   purescript:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   push-notify-ccs:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7904,6 +7967,7 @@ dont-distribute-packages:
   quickcheck-state-machine-distributed:           [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-state-machine:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-webdriver:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  quickcheck-with-counterexamples:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   QuickCheckVariant:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   QuickPlot:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickpull:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7928,6 +7992,7 @@ dont-distribute-packages:
   rad:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   radium-formula-parser:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   radium:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  radix-tree:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   radix:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   rados-haskell:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   raft:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8335,6 +8400,7 @@ dont-distribute-packages:
   scrobble:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   scrz:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Scurry:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  scythe:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   scyther-proof:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   sde-solver:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   sdl2-cairo-image:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8411,6 +8477,7 @@ dont-distribute-packages:
   servant-generic:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-github:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-haxl-client:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-hmac-auth:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-iCalendar:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-jquery:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-js:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8572,6 +8639,7 @@ dont-distribute-packages:
   skeletons:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   skell:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   skemmtun:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  skews:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   skulk:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   skylark-client:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   skype4hs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8692,6 +8760,7 @@ dont-distribute-packages:
   socketson:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   sodium:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   soegtk:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  softfloat-hs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   solga-swagger:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   solga:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   solr:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8785,6 +8854,7 @@ dont-distribute-packages:
   stack-network:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   stack-run-auto:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   stack-run:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stack2nix:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage-build-plan:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage-cabal:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage-cli:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9098,6 +9168,7 @@ dont-distribute-packages:
   text-format-heavy:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-generic-pretty:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-icu-normalized:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  text-icu-translit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-json-qq:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-lens:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-locale-encoding:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9207,12 +9278,14 @@ dont-distribute-packages:
   toilet:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tokenify:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   tokenizer-monad:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tokstyle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   toktok:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tokyocabinet-haskell:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   tokyotyrant-haskell:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   tomato-rubato-openal:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   toml-parser:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   toml:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tomlcheck:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Top:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   top:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   topkata:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9232,6 +9305,7 @@ dont-distribute-packages:
   traced:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tracker:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   trackit:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  traction:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   tracy:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   traildb:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   trajectory:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9299,6 +9373,7 @@ dont-distribute-packages:
   turtle-options:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   TV:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   tweak:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  twee:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   tweet-hs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   twentefp-eventloop-graphics:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   twentefp-eventloop-trees:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9456,6 +9531,9 @@ dont-distribute-packages:
   utf8-prelude:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   utf8-validator:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   UTFTConverter:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  util-exception:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  util-primitive-control:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  util-primitive:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   uu-cco-examples:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   uu-cco-hut-parsing:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   uu-cco-uu-parsinglib:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9490,6 +9568,7 @@ dont-distribute-packages:
   varying:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   vault-tool-server:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   vault-tool:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vault-trans:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   vaultaire-common:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   vcard:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   vcatt:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9585,6 +9664,7 @@ dont-distribute-packages:
   wai-middleware-headers:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-hmac-client:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-preprocessor:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-middleware-prometheus:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-rollbar:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-route:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-static-caching:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9669,6 +9749,7 @@ dont-distribute-packages:
   winio:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   wire-streams:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   wiring:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wkt-geom:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   wkt:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   wl-pprint-ansiterm:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   WL500gPControl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9700,6 +9781,7 @@ dont-distribute-packages:
   wsdl:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   wsedit:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wsjtx-udp:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wss-client:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   wtk-gtk:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   wtk:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   wumpus-basic:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9947,6 +10029,7 @@ dont-distribute-packages:
   zeromq4-conduit:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   zeromq4-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   zeromq4-patterns:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zeromq4-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   zeroth:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ZFS:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   zifter-cabal:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 6db88796b64c..1007be349fc9 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -5837,6 +5837,7 @@ self: {
        ];
        description = "A library for accessing Postgres tables as in-memory data structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Frank" = callPackage
@@ -6581,6 +6582,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Glob_0_9_3" = callPackage
+    ({ mkDerivation, base, containers, directory, dlist, filepath
+     , HUnit, QuickCheck, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "Glob";
+       version = "0.9.3";
+       sha256 = "1s69lk3ic6zlkikhvb78ly9wl3g70a1h1m6ndhsca01pp8z8axrs";
+       libraryHaskellDepends = [
+         base containers directory dlist filepath transformers
+         transformers-compat
+       ];
+       testHaskellDepends = [
+         base containers directory dlist filepath HUnit QuickCheck
+         test-framework test-framework-hunit test-framework-quickcheck2
+         transformers transformers-compat
+       ];
+       description = "Globbing library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "GlomeTrace" = callPackage
     ({ mkDerivation, array, base, GlomeVec }:
      mkDerivation {
@@ -8572,6 +8596,8 @@ self: {
        pname = "HTTP";
        version = "4000.3.12";
        sha256 = "140r6qy1ay25piv0z3hih11zhigyi08nkwc32097j43pjff6mzx3";
+       revision = "1";
+       editedCabalFile = "108i60vy6r7k1yaraw9g6xc7r82nwb9h84vsk9q5s01z980c7kk4";
        libraryHaskellDepends = [
          array base bytestring mtl network network-uri parsec time
        ];
@@ -10997,6 +11023,7 @@ self: {
        ];
        description = "Library for automated composition and musical learning";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "KyotoCabinet" = callPackage
@@ -13417,6 +13444,8 @@ self: {
        pname = "OTP";
        version = "0.1.0.0";
        sha256 = "1r7vpc0bv89d70j6pc3z3vam93gahl4j0y5w8smknxwjliwqxkcb";
+       revision = "1";
+       editedCabalFile = "1bcp6mixf0yxn6qmql3zhyshpa55mkrfnxdb1ma6gvbs7h28lnin";
        libraryHaskellDepends = [
          base bytestring cryptohash-sha1 cryptohash-sha256 cryptohash-sha512
          time
@@ -13899,13 +13928,14 @@ self: {
        pname = "Oslo-Vectize";
        version = "0.2";
        sha256 = "05lgpaw6glwflczsa3400fhih717ry4sikhs9ypyd7xlqvraad57";
-       revision = "1";
-       editedCabalFile = "03fchm31c0yl36l8nn3bykgncidrhp3ql44j0r3853s3vknai9gp";
+       revision = "2";
+       editedCabalFile = "0axdqcpl3rl9lh9rvd5cn4llvglca8y82p1l3rvka97b33lfj8ky";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ];
-       description = "Tests";
+       description = "spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "PArrows" = callPackage
@@ -15350,8 +15380,8 @@ self: {
      }:
      mkDerivation {
        pname = "Raincat";
-       version = "1.2";
-       sha256 = "1zyxkvjxkadwakg03xnjii1hx0gs45ap9rfkpi4kxipzxppq1klk";
+       version = "1.2.1";
+       sha256 = "10y9zi22m6hf13c9h8zd9vg7mljpwbw0r3djb6r80bna701fdf6c";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -17250,6 +17280,8 @@ self: {
        pname = "Strafunski-StrategyLib";
        version = "5.0.1.0";
        sha256 = "15d2m7ahb3jwriariaff0yz93mmrhpv579wink9838w9091cf650";
+       revision = "1";
+       editedCabalFile = "1hngxq1f7fybg6ixkdhmvgsw608mhnxkwbw04ql5zspcfl78v6l2";
        libraryHaskellDepends = [ base directory mtl syb transformers ];
        description = "Library for strategic programming";
        license = stdenv.lib.licenses.bsd3;
@@ -23102,8 +23134,8 @@ self: {
     ({ mkDerivation, base, syb, template-haskell }:
      mkDerivation {
        pname = "algebraic-classes";
-       version = "0.9.1";
-       sha256 = "129s5690wc4w92sg246pcmnradzgfdddqpv961a53k2cx9ynmvc6";
+       version = "0.9.2";
+       sha256 = "131rd3liqkdp146fyc8b0mcbkn08mib9iljyjj3mp40fs64sy1c9";
        libraryHaskellDepends = [ base syb template-haskell ];
        description = "Conversions between algebraic classes and F-algebras";
        license = stdenv.lib.licenses.bsd3;
@@ -26952,6 +26984,7 @@ self: {
          aeson antiope-s3 avro base bytestring text
        ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "antiope-core" = callPackage
@@ -28133,6 +28166,7 @@ self: {
        ];
        description = "Convenience types and functions for postgresql-simple";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arbtt" = callPackage
@@ -28567,6 +28601,35 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "arithmoi_0_8_0_0" = callPackage
+    ({ mkDerivation, array, base, containers, deepseq, exact-pi, gauge
+     , ghc-prim, integer-gmp, integer-logarithms, QuickCheck, random
+     , smallcheck, tasty, tasty-hunit, tasty-quickcheck
+     , tasty-smallcheck, transformers, vector
+     }:
+     mkDerivation {
+       pname = "arithmoi";
+       version = "0.8.0.0";
+       sha256 = "17nk0n89fb0qh6w8535ll45mq4msir32w6fhqzpzhlpbily3mlw2";
+       revision = "1";
+       editedCabalFile = "00s941gdf4y04sf0jxl329mnpcpa6cydmsa6l4mja8sdv6akzq52";
+       configureFlags = [ "-f-llvm" ];
+       libraryHaskellDepends = [
+         array base containers deepseq exact-pi ghc-prim integer-gmp
+         integer-logarithms random transformers vector
+       ];
+       testHaskellDepends = [
+         base containers exact-pi integer-gmp QuickCheck smallcheck tasty
+         tasty-hunit tasty-quickcheck tasty-smallcheck transformers vector
+       ];
+       benchmarkHaskellDepends = [
+         base containers deepseq gauge integer-logarithms random vector
+       ];
+       description = "Efficient basic number-theoretic functions";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "armada" = callPackage
     ({ mkDerivation, base, GLUT, mtl, OpenGL, stm }:
      mkDerivation {
@@ -28645,8 +28708,8 @@ self: {
        pname = "array";
        version = "0.5.2.0";
        sha256 = "12v83s2imxb3p2crnlzrpjh0nk6lpysw9bdk9yahs6f37csa5jaj";
-       revision = "1";
-       editedCabalFile = "195c914pc0vk1ya6lz42kb4gmhkam7s0xi7x0dgzhpb5gkcrs5qx";
+       revision = "2";
+       editedCabalFile = "1irpwz3spy3yy27kzw8sklhcvxz3mx9fkgqia7r9m069w5wid9kg";
        libraryHaskellDepends = [ base ];
        description = "Mutable and immutable arrays";
        license = stdenv.lib.licenses.bsd3;
@@ -28972,6 +29035,7 @@ self: {
        ];
        description = "Compact representation of ASCII strings";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ascii-table" = callPackage
@@ -29524,6 +29588,7 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Async combinators";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "async-dejafu" = callPackage
@@ -30739,6 +30804,7 @@ self: {
        ];
        description = "A secure package manager for Arch Linux and the AUR, written in Haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "authenticate" = callPackage
@@ -31941,6 +32007,7 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "The Axel programming language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "axiom" = callPackage
@@ -32665,12 +32732,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "base_4_11_1_0" = callPackage
+  "base_4_12_0_0" = callPackage
     ({ mkDerivation, ghc-prim, invalid-cabal-flag-settings, rts }:
      mkDerivation {
        pname = "base";
-       version = "4.11.1.0";
-       sha256 = "0q2ygfqy4qim8h9fmlb5iwfnf2lrly27bqqvnckdlmh775fmq07g";
+       version = "4.12.0.0";
+       sha256 = "0ka18cvw1cjvjdd20n03rjmxfm10083mh19wxwz1f1kqiyc92g3w";
        libraryHaskellDepends = [
          ghc-prim invalid-cabal-flag-settings rts
        ];
@@ -32744,6 +32811,8 @@ self: {
        pname = "base-encoding";
        version = "0.1.0.0";
        sha256 = "1chmx5qvglf91i0c9ih9xydzb37v8j4bykvmb2g6pyg7wdq0s8si";
+       revision = "1";
+       editedCabalFile = "0miysladpqwm5qhphv23qhvambd7245n14qbkgvp664xj56y6df1";
        libraryHaskellDepends = [
          base base16-bytestring base64-bytestring bytestring text
        ];
@@ -32792,8 +32861,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "base-noprelude";
-       version = "4.11.1.0";
-       sha256 = "19d1x487kwhc60qjix7xx53dlszbx08rdhxd2zab1pwjw62ws3c8";
+       version = "4.12.0.0";
+       sha256 = "1hb25nj49k4lcxi4w33qvcy8izkgsvls5kasmva6hjlvg8b35ymb";
        libraryHaskellDepends = [ base ];
        doHaddock = false;
        description = "\"base\" package sans \"Prelude\" module";
@@ -33853,8 +33922,8 @@ self: {
      }:
      mkDerivation {
        pname = "bench-graph";
-       version = "0.1.3";
-       sha256 = "15xsaqxms61p8d5r0lsxhlrdfh451ha6fpldcmh8vcw0q4yb1q47";
+       version = "0.1.4";
+       sha256 = "144al44v3m00lh1rrhjyah0gacbi2n6hjlqvml3yqwf8j9c37wnw";
        libraryHaskellDepends = [
          base Chart Chart-diagrams csv directory filepath transformers
        ];
@@ -35983,6 +36052,8 @@ self: {
        pname = "biohazard";
        version = "1.0.4";
        sha256 = "1gj5xr0b9s2zifknm10bynkh0gvsi0gmw2sa3zcp1if17ixndv2c";
+       revision = "2";
+       editedCabalFile = "0r1fz9h92zyb7ryk8lngqlyl75djr8ngbcfrr9bbmz8img2ipb2a";
        libraryHaskellDepends = [
          async attoparsec base base-prelude bytestring containers exceptions
          hashable primitive stm text transformers unix unordered-containers
@@ -37838,11 +37909,14 @@ self: {
        pname = "blunk-hask-tests";
        version = "0.2";
        sha256 = "10x4xjlp1mj9gmsibvd21k76gj97prdsgwxxpg39425xgrzph6ll";
+       revision = "1";
+       editedCabalFile = "0wnp6rzq3iisi9vfk0nci4cb8kdwijdyv60f6kg0bhz1xzn7i6ww";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ];
-       description = "Tests for the Blunk sequencer library";
+       description = "spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blunt" = callPackage
@@ -38757,6 +38831,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Brainh*ck interpreter in haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "break" = callPackage
@@ -38900,6 +38975,7 @@ self: {
        ];
        description = "Show syntax-highlighted text in your Brick UI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bricks" = callPackage
@@ -39084,6 +39160,7 @@ self: {
        ];
        description = "Haskell source code formatter";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "broadcast-chan" = callPackage
@@ -39128,6 +39205,7 @@ self: {
        ];
        description = "Conduit-based parallel streaming code for broadcast-chan";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "broadcast-chan-pipes" = callPackage
@@ -39144,6 +39222,7 @@ self: {
        ];
        description = "Pipes-based parallel streaming code for broadcast-chan";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "broadcast-chan-tests" = callPackage
@@ -39166,6 +39245,7 @@ self: {
        ];
        description = "Helpers for generating tests for broadcast-chan";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "broccoli" = callPackage
@@ -39609,6 +39689,7 @@ self: {
        ];
        description = "Bugsnag error reporter for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bugzilla" = callPackage
@@ -40955,12 +41036,12 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-cargs";
-       version = "1.0.0";
-       sha256 = "025cdf78kg572b8bk5xxz4qxibjn4c72x2d3rxn6crz722139rf0";
+       version = "1.1.0";
+       sha256 = "0lrhgbzkswjm4abffacyw6zp4s3na3vp0vkprpxcygm6yjs7db2q";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring Cabal cabal-lenses cmdargs directory lens
+         base bytestring Cabal cabal-lenses cmdargs directory filepath lens
          system-fileio system-filepath text transformers
          unordered-containers
        ];
@@ -41423,6 +41504,8 @@ self: {
        pname = "cabal-plan";
        version = "0.4.0.0";
        sha256 = "0cbk0xhv189jv656x6a2s0bcnhkks4rlpkhvxbb215v5ldmrkpb1";
+       revision = "1";
+       editedCabalFile = "161vgfbwm8psqa6ncs12j7sn5lqjag1xi62vllvp8xbz9lcvbchb";
        configureFlags = [ "-fexe" ];
        isLibrary = true;
        isExecutable = true;
@@ -41802,14 +41885,14 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
-  "cabal2spec_2_2_1" = callPackage
+  "cabal2spec_2_2_2" = callPackage
     ({ mkDerivation, base, Cabal, filepath, optparse-applicative, tasty
      , tasty-golden, time
      }:
      mkDerivation {
        pname = "cabal2spec";
-       version = "2.2.1";
-       sha256 = "1j4y942r2v1s9cvvgnpjckl7s9bmpby1w4z4gffpbfirrc2h1nq6";
+       version = "2.2.2";
+       sha256 = "1rb7z4lslqsf8ipsyy7nc3mz4ixz5f5cv5jn5nidj0pc5rl16sxw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base Cabal filepath time ];
@@ -42785,6 +42868,7 @@ self: {
        ];
        description = "Cap'n Proto for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "capped-list" = callPackage
@@ -43470,6 +43554,8 @@ self: {
        pname = "cassava";
        version = "0.5.1.0";
        sha256 = "0xs2c5lpy0g5lsmp2cx0dm5lnxij7cgry6xd5gsn3bfdlap8lb3n";
+       revision = "1";
+       editedCabalFile = "1brz20js95synh0yw942ihy4y9y6nk4xnsqcjqi9580y24zcigkl";
        configureFlags = [ "-f-bytestring--lt-0_10_4" ];
        libraryHaskellDepends = [
          array attoparsec base bytestring containers deepseq hashable Only
@@ -50211,8 +50297,8 @@ self: {
      }:
      mkDerivation {
        pname = "concraft";
-       version = "0.11.0";
-       sha256 = "07da6r8rw4vphr7q5i0lfap80vlbq1jm9lsbjp6khc7n59l5b2j7";
+       version = "0.12.1";
+       sha256 = "1zjrv58fl4lkknmmih0dwi9ds241mxi42q3fxlpd8z5hlgq9pxpj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -50258,8 +50344,8 @@ self: {
      }:
      mkDerivation {
        pname = "concraft-pl";
-       version = "2.0.2";
-       sha256 = "0vl49khchpsyxlwxa55xpah8gnjqgfx0vb9jrjzdbfaj293g77sm";
+       version = "2.1.1";
+       sha256 = "1fznivcsgyjhb62jzk9a3wsv8rmynr7y7473ldbqypkjgy2rmvf2";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -50409,6 +50495,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "concurrency_1_6_1_0" = callPackage
+    ({ mkDerivation, array, atomic-primops, base, exceptions
+     , monad-control, mtl, stm, transformers
+     }:
+     mkDerivation {
+       pname = "concurrency";
+       version = "1.6.1.0";
+       sha256 = "00cycrgs2zl2jsg1acc1glcw9ladmgqwxxdqq1ss6v36j8qhk920";
+       libraryHaskellDepends = [
+         array atomic-primops base exceptions monad-control mtl stm
+         transformers
+       ];
+       description = "Typeclasses, functions, and data types for concurrency and STM";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "concurrency-benchmarks" = callPackage
     ({ mkDerivation, async, base, bench-graph, bytestring, Chart
      , Chart-diagrams, csv, deepseq, directory, gauge, getopt-generics
@@ -50429,6 +50532,7 @@ self: {
        ];
        description = "Benchmarks to compare concurrency APIs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "concurrent-barrier" = callPackage
@@ -50552,6 +50656,23 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "concurrent-output_1_10_7" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, directory, exceptions
+     , process, stm, terminal-size, text, transformers, unix
+     }:
+     mkDerivation {
+       pname = "concurrent-output";
+       version = "1.10.7";
+       sha256 = "0w5x81n9ljs8l2b8ypy2naazvrv16qqlm1lfzvsksnii2nm1al30";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "concurrent-rpc" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -51322,8 +51443,8 @@ self: {
        pname = "config-schema";
        version = "0.5.0.1";
        sha256 = "18zdq0w65cs2zy8p0pvb0jfqffcyxq9km1c2h5fvky8c689lp0gp";
-       revision = "2";
-       editedCabalFile = "0wibr3739xwkvdl48cahppaxn8v20gcmhrjxjj8hkhvgnbpfi2gn";
+       revision = "3";
+       editedCabalFile = "102mwr18aas924hlxsyyx5pi8skkb2misic1h95f6khpz7wcy3vy";
        libraryHaskellDepends = [
          base config-value containers free kan-extensions pretty
          semigroupoids text transformers
@@ -51355,6 +51476,8 @@ self: {
        pname = "config-value";
        version = "0.6.3.1";
        sha256 = "0gfr9qcw8a7y1y9cn6635y8fgvrpkmcqx31bn2a070rbrmk3757z";
+       revision = "1";
+       editedCabalFile = "16h47yc8z3fkxs6gdyzfkahi9ibm7narkc72xcx67bmk309xb46c";
        libraryHaskellDepends = [ array base pretty text ];
        libraryToolDepends = [ alex happy ];
        description = "Simple, layout-based value language similar to YAML or JSON";
@@ -54168,8 +54291,8 @@ self: {
      }:
      mkDerivation {
        pname = "crf-chain1-constrained";
-       version = "0.4.0";
-       sha256 = "1mqprywxh51hvbchw1pvg66bsdf24rx6ywk06z98sx88rlvc4a2q";
+       version = "0.5.0";
+       sha256 = "194mcafkf23lifmx2n2hnvsaxl0mfdl9zgl9awigddwxvpxsrmjq";
        libraryHaskellDepends = [
          array base binary containers data-lens data-memocombinators
          logfloat monad-codec parallel pedestrian-dag random sgd vector
@@ -54259,6 +54382,8 @@ self: {
        pname = "criterion";
        version = "1.4.1.0";
        sha256 = "0v429araqkcw3wwwi6fsp0g7g1hy3l47p061lcy7r4m7d9khd4y4";
+       revision = "1";
+       editedCabalFile = "0jg7mk9y9br5aqi29vrrrq28mnyknyg96zmr8rrlxw0rf68l892a";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -55240,6 +55365,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) openssl;};
 
+  "cryptostore" = callPackage
+    ({ mkDerivation, asn1-encoding, asn1-types, base, basement
+     , bytestring, cryptonite, hourglass, memory, pem, tasty
+     , tasty-hunit, tasty-quickcheck, x509
+     }:
+     mkDerivation {
+       pname = "cryptostore";
+       version = "0.1.0.0";
+       sha256 = "1pq53k0dx0akwp1rkgadyb256w0lds8iq7yn2xb217nyjyghyrqz";
+       libraryHaskellDepends = [
+         asn1-encoding asn1-types base basement bytestring cryptonite
+         hourglass memory pem x509
+       ];
+       testHaskellDepends = [
+         asn1-types base bytestring cryptonite hourglass memory pem tasty
+         tasty-hunit tasty-quickcheck x509
+       ];
+       description = "Serialization of cryptographic data types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "cryptsy-api" = callPackage
     ({ mkDerivation, aeson, base, bytestring, deepseq, either
      , http-client, http-client-tls, old-locale, pipes-attoparsec
@@ -58198,6 +58344,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "data-ref_0_0_1_2" = callPackage
+    ({ mkDerivation, base, stm, transformers }:
+     mkDerivation {
+       pname = "data-ref";
+       version = "0.0.1.2";
+       sha256 = "0896wjkpk52cndlzkdr51s1rasi0n9b100058f1sb4qzl1dgcp30";
+       libraryHaskellDepends = [ base stm transformers ];
+       description = "Unify STRef and IORef in plain Haskell 98";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "data-reify" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -60007,16 +60165,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "deepseq_1_4_3_0" = callPackage
+  "deepseq_1_4_4_0" = callPackage
     ({ mkDerivation, array, base, ghc-prim, HUnit, test-framework
      , test-framework-hunit
      }:
      mkDerivation {
        pname = "deepseq";
-       version = "1.4.3.0";
-       sha256 = "0fjdmsd8fqqv78m7111m10pdfswnxmn02zx1fsv2k26b5jckb0bd";
-       revision = "1";
-       editedCabalFile = "0djisxi7z2xyx3wps550avgz5x56rl4xzks17j996crdsrdrcqh9";
+       version = "1.4.4.0";
+       sha256 = "09kfpmgl679l74b6dadia11pvhya9ik4wrd8x76cgkxk7gwcbkrc";
        libraryHaskellDepends = [ array base ];
        testHaskellDepends = [
          array base ghc-prim HUnit test-framework test-framework-hunit
@@ -60058,8 +60214,8 @@ self: {
        pname = "deepseq-generics";
        version = "0.2.0.0";
        sha256 = "17bwghc15mc9pchfd1w46jh2p3wzc86aj6a537wqwxn08rayzcxh";
-       revision = "2";
-       editedCabalFile = "1pnidf8w8x0w5fsqgv8hhrw07slmhxwy5x4fikgk0bd6k76aqicb";
+       revision = "3";
+       editedCabalFile = "0734x6dm7ny1422n5ik4agzmjybvd3yybj1mnrc8z0kb89xdprcs";
        libraryHaskellDepends = [ base deepseq ghc-prim ];
        testHaskellDepends = [
          base deepseq ghc-prim HUnit test-framework test-framework-hunit
@@ -60516,6 +60672,7 @@ self: {
        ];
        description = "Dense int-set";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dependency" = callPackage
@@ -63342,6 +63499,7 @@ self: {
        ];
        description = "Write bots for Discord in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "discord-hs" = callPackage
@@ -64876,6 +65034,7 @@ self: {
        ];
        description = "Builds a docker image and caches all of its intermediate stages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dockercook" = callPackage
@@ -65017,6 +65176,36 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "doctest_0_16_0_1" = 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.16.0.1";
+       sha256 = "106pc4rs4cfym7754gzdgy36dm9aidwmnqpjm9k7yq1hfd4pallv";
+       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
+       ];
+       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
@@ -68879,6 +69068,7 @@ self: {
        testHaskellDepends = [ base doctest Glob ];
        description = "Wrapper around email-validate library adding instances for common type classes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "emailparse" = callPackage
@@ -69285,6 +69475,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "entropy_0_4_1_3" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, directory, filepath
+     , process, unix
+     }:
+     mkDerivation {
+       pname = "entropy";
+       version = "0.4.1.3";
+       sha256 = "07596n4ligi1a6jddkh5kf94mrcg03kybs5wa198672d2gdfn2ji";
+       setupHaskellDepends = [ base Cabal directory filepath process ];
+       libraryHaskellDepends = [ base bytestring unix ];
+       description = "A platform independent entropy source";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "enum-subset-generate" = callPackage
     ({ mkDerivation, base, generic-random, hspec, microlens, QuickCheck
      , template-haskell
@@ -69776,6 +69981,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "equivalence_0_3_3" = callPackage
+    ({ mkDerivation, base, containers, mtl, QuickCheck, STMonadTrans
+     , template-haskell, test-framework, test-framework-quickcheck2
+     , transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "equivalence";
+       version = "0.3.3";
+       sha256 = "02jhn8z1aqyxp3krylhfnwr7zzjcd17q9qriyd9653i92b7di3gf";
+       libraryHaskellDepends = [
+         base containers mtl STMonadTrans transformers transformers-compat
+       ];
+       testHaskellDepends = [
+         base containers mtl QuickCheck STMonadTrans template-haskell
+         test-framework test-framework-quickcheck2 transformers
+         transformers-compat
+       ];
+       description = "Maintaining an equivalence relation implemented as union-find using STT";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "erd" = callPackage
     ({ mkDerivation, base, bytestring, containers, graphviz, parsec
      , text
@@ -72467,6 +72694,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "faceted" = callPackage
@@ -74613,8 +74841,8 @@ self: {
        pname = "filepath-crypto";
        version = "0.1.0.0";
        sha256 = "1bj9haa4ignmk6c6gdiqb4rnwy395pwqdyfy4kgg0z16w0l39mw0";
-       revision = "5";
-       editedCabalFile = "1xyrac6m3szzj7x68fnrf7nh43gq03g9rwyynfxdx290bgc38gch";
+       revision = "6";
+       editedCabalFile = "0lg22k1f9l51a8bdnhkwq07mg0m3w3rhgavp1lxi3vmsszsmpmvc";
        libraryHaskellDepends = [
          base binary bytestring case-insensitive cryptoids cryptoids-class
          cryptoids-types exceptions filepath sandi template-haskell
@@ -76584,6 +76812,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fold-debounce_0_2_0_8" = callPackage
+    ({ mkDerivation, base, data-default-class, hspec, stm, stm-delay
+     , time
+     }:
+     mkDerivation {
+       pname = "fold-debounce";
+       version = "0.2.0.8";
+       sha256 = "1j7v11nq2q7p50z27lbmprwqrhvcf9qa5zy2hql68zsi53q3wszw";
+       libraryHaskellDepends = [
+         base data-default-class stm stm-delay time
+       ];
+       testHaskellDepends = [ base hspec stm time ];
+       description = "Fold multiple events that happen in a given period of time";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fold-debounce-conduit" = callPackage
     ({ mkDerivation, base, conduit, fold-debounce, hspec, resourcet
      , stm, transformers, transformers-base
@@ -76603,6 +76848,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fold-debounce-conduit_0_2_0_2" = callPackage
+    ({ mkDerivation, base, conduit, fold-debounce, hspec, resourcet
+     , stm, transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "fold-debounce-conduit";
+       version = "0.2.0.2";
+       sha256 = "18hxlcm0fixx4iiac26cdbkkqivg71qk3z50k71l9n3yashijjdc";
+       libraryHaskellDepends = [
+         base conduit fold-debounce resourcet stm transformers
+         transformers-base
+       ];
+       testHaskellDepends = [
+         base conduit hspec resourcet stm transformers
+       ];
+       description = "Regulate input traffic from conduit Source with Control.FoldDebounce";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "foldable1" = callPackage
     ({ mkDerivation, base, transformers, util }:
      mkDerivation {
@@ -76813,6 +77078,7 @@ self: {
        ];
        description = "Haskell library to follow content published on any subject";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "follow-file" = callPackage
@@ -77849,18 +78115,15 @@ self: {
 
   "free-functors" = callPackage
     ({ mkDerivation, algebraic-classes, base, bifunctors, comonad
-     , constraints, contravariant, profunctors, template-haskell
-     , transformers
+     , contravariant, profunctors, template-haskell, transformers
      }:
      mkDerivation {
        pname = "free-functors";
-       version = "0.8.4";
-       sha256 = "0qdllnqghnx6j51zyxqblnz809w7l86qp0d9dg8a4l4kllp1y703";
-       revision = "1";
-       editedCabalFile = "0yl71dl7rp8si7gshj1f713cjxmk5dzkb6m6d3vicc97b37s6r5j";
+       version = "1.0";
+       sha256 = "061xly5fl7a28dsjw9m8dzyh59fkjrs6ijhcqfn2n4y8azch9f6c";
        libraryHaskellDepends = [
-         algebraic-classes base bifunctors comonad constraints contravariant
-         profunctors template-haskell transformers
+         algebraic-classes base bifunctors comonad contravariant profunctors
+         template-haskell transformers
        ];
        description = "Free functors, adjoint to functors that forget class constraints";
        license = stdenv.lib.licenses.bsd3;
@@ -78027,6 +78290,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "free-v-bucks-generator-ps4-no-survey" = callPackage
@@ -78042,6 +78306,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "free-vector-spaces" = callPackage
@@ -80582,6 +80847,7 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Utilities for GHC.Generics";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generic-deepseq" = callPackage
@@ -81619,8 +81885,8 @@ self: {
      }:
      mkDerivation {
        pname = "geoip2";
-       version = "0.3.1.0";
-       sha256 = "1w9iqfkyi0ij33kng4adczi6m8chyhsadc2af5ryp8xzl7w64l8m";
+       version = "0.3.1.1";
+       sha256 = "0nq4kijjd0dmii5949xr7wf4w7fi2ffpbqr9bg7qklxhsrmwywb8";
        libraryHaskellDepends = [
          base bytestring cereal containers iproute mmap reinterpret-cast
          text
@@ -81881,14 +82147,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ghc-boot_8_4_3" = callPackage
+  "ghc-boot_8_6_1" = callPackage
     ({ mkDerivation, base, binary, bytestring, directory, filepath
      , ghc-boot-th
      }:
      mkDerivation {
        pname = "ghc-boot";
-       version = "8.4.3";
-       sha256 = "028x85pmvacndkv6mm9vrg9j6p6zw0a6v2mdwibhf3ck3wwm9v8m";
+       version = "8.6.1";
+       sha256 = "0dy9p2vz7ccwrhk9l4vs4fhfg6w9p7pk88iy44i46089svzx0wja";
        libraryHaskellDepends = [
          base binary bytestring directory filepath ghc-boot-th
        ];
@@ -81897,12 +82163,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ghc-boot-th_8_4_3" = callPackage
+  "ghc-boot-th_8_6_1" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "ghc-boot-th";
-       version = "8.4.3";
-       sha256 = "19q4j9n0ir0b5cc54sazzf4m51fd6mz6705wzplva4qh5602dafi";
+       version = "8.6.1";
+       sha256 = "0z3d9niqzsv1zihazs1ghdwag53fcmdigj77z37licc5q0g0lc49";
        libraryHaskellDepends = [ base ];
        description = "Shared functionality between GHC and the @template-haskell@ library";
        license = stdenv.lib.licenses.bsd3;
@@ -81926,8 +82192,8 @@ self: {
        pname = "ghc-compact";
        version = "0.1.0.0";
        sha256 = "03sf8ap1ncjsibp9z7k9xgcsj9s0q3q6l4shf8k7p8dkwpjl1g2h";
-       revision = "1";
-       editedCabalFile = "1fwcfk515lv3pjzxz87bddk3kdbkaxswxrr37spdlkvyyfrbxyak";
+       revision = "2";
+       editedCabalFile = "1i775sc8sb89gali1w7qxs7l6y8vawp1mdd564d5mz95sxj4757b";
        libraryHaskellDepends = [ base bytestring ghc-prim ];
        description = "In memory storage of deeply evaluated data structure";
        license = stdenv.lib.licenses.bsd3;
@@ -82158,15 +82424,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ghc-exactprint_0_5_8_0" = callPackage
+  "ghc-exactprint_0_5_8_1" = 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.8.0";
-       sha256 = "1hmyk5d0sbf4kqp4bzcl6q3vf6dpbx2imqky7r206g39xkx3y3fh";
+       version = "0.5.8.1";
+       sha256 = "1qjl137f4lpadkgdyfjnkkga8vqyw0x27plpyw57aqhc8qmcylhh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -82455,8 +82721,8 @@ self: {
        pname = "ghc-paths";
        version = "0.1.0.9";
        sha256 = "0ibrr1dxa35xx20cpp8jzgfak1rdmy344dfwq4vlq013c6w8z9mg";
-       revision = "3";
-       editedCabalFile = "1gx47xbm3qviqccnbsibzkfnlzljvls33jh1ry4l506yvfnf4j10";
+       revision = "4";
+       editedCabalFile = "1fp0jyvi6prqsv0dxn010c7q4mmiwlcy1xk6ppd4d539adxxy67d";
        setupHaskellDepends = [ base Cabal directory ];
        libraryHaskellDepends = [ base ];
        description = "Knowledge of GHC's installation directories";
@@ -82689,6 +82955,8 @@ self: {
        pname = "ghc-tcplugins-extra";
        version = "0.3";
        sha256 = "0k1ph8za52mx6f146xhaakn630xrzk42ylchv4b9r04hslhzvb1h";
+       revision = "1";
+       editedCabalFile = "0x2d4bp5lhyfrqjshmgbirdn2ihc057a8a6khqmz91jj9zlhf7vb";
        libraryHaskellDepends = [ base ghc ];
        description = "Utilities for writing GHC type-checker plugins";
        license = stdenv.lib.licenses.bsd2;
@@ -82890,23 +83158,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ghci_8_4_3" = callPackage
+  "ghci_8_6_1" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
-     , deepseq, filepath, ghc-boot, ghc-boot-th, template-haskell
-     , transformers, unix
+     , deepseq, filepath, ghc-boot, ghc-boot-th, ghc-heap
+     , template-haskell, transformers, unix
      }:
      mkDerivation {
        pname = "ghci";
-       version = "8.4.3";
-       sha256 = "1jzzig7ikyy14xsanga0zaaqk3xj57pkwx301db89cns8yyq7vxj";
+       version = "8.6.1";
+       sha256 = "0ffv5xmq63y53fhfldx37g6881l07nvlgdsp9kfqz70flh0c1wm8";
        libraryHaskellDepends = [
          array base binary bytestring containers deepseq filepath ghc-boot
-         ghc-boot-th template-haskell transformers unix
+         ghc-boot-th ghc-heap template-haskell transformers unix
        ];
        description = "The library supporting GHC's interactive interpreter";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+       broken = true;
+     }) {ghc-heap = null;};
 
   "ghci-diagrams" = callPackage
     ({ mkDerivation, base, cairo, colour, diagrams, gtk }:
@@ -85985,6 +86254,7 @@ self: {
        libraryHaskellDepends = [ base containers ghc-prim gloss ];
        description = "Data structures and algorithms for working with 2D graphics";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gloss-banana" = callPackage
@@ -86030,6 +86300,7 @@ self: {
        ];
        description = "Examples using the gloss library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gloss-export" = callPackage
@@ -86060,6 +86331,7 @@ self: {
        libraryHaskellDepends = [ base gloss gloss-juicy ];
        description = "Gloss wrapper that simplifies writing games";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gloss-juicy" = callPackage
@@ -86081,6 +86353,7 @@ self: {
        ];
        description = "Load any image supported by Juicy.Pixels in your gloss application";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gloss-raster" = callPackage
@@ -89775,6 +90048,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "greskell-websocket_0_1_1_1" = callPackage
+    ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring
+     , greskell-core, hashtables, hspec, safe-exceptions, stm, text
+     , unordered-containers, uuid, vector, websockets
+     }:
+     mkDerivation {
+       pname = "greskell-websocket";
+       version = "0.1.1.1";
+       sha256 = "133jwmqm5swm214sav8kigg8lqvk64g1nly5zk1xcij6rajxryci";
+       libraryHaskellDepends = [
+         aeson async base base64-bytestring bytestring greskell-core
+         hashtables safe-exceptions stm text unordered-containers uuid
+         vector websockets
+       ];
+       testHaskellDepends = [
+         aeson base bytestring greskell-core hspec unordered-containers uuid
+         vector
+       ];
+       description = "Haskell client for Gremlin Server using WebSocket serializer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "grid" = callPackage
     ({ mkDerivation, base, cereal, containers, QuickCheck
      , test-framework, test-framework-quickcheck2
@@ -90227,6 +90523,7 @@ self: {
        libraryHaskellDepends = [ base proto-lens proto-lens-runtime ];
        description = "Generated messages and instances for etcd gRPC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "grpc-etcd-client" = callPackage
@@ -90243,6 +90540,7 @@ self: {
        ];
        description = "gRPC client for etcd";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gruff" = callPackage
@@ -94998,8 +95296,8 @@ self: {
        pname = "happy";
        version = "1.19.9";
        sha256 = "138xpxdb7x62lpmgmb6b3v3vgdqqvqn4273jaap3mjmc2gla709y";
-       revision = "2";
-       editedCabalFile = "1zxi8zfwiwxidrhr0yj5srpzp32z66sld9xv0k4yz7046rkl3577";
+       revision = "3";
+       editedCabalFile = "0kwlh964nyqvfbm02np8vpc28gbhsby0r65jhz1918rm0wip9izq";
        isLibrary = false;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal directory filepath ];
@@ -97007,6 +97305,7 @@ self: {
        ];
        description = "Manage nix overrides for haskell packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-packages" = callPackage
@@ -97129,6 +97428,7 @@ self: {
        testPkgconfigDepends = [ libpostal ];
        description = "Haskell binding for the libpostal library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {libpostal = null;};
 
   "haskell-proxy-list" = callPackage
@@ -98611,6 +98911,7 @@ self: {
        ];
        description = "An adapter for haskoin to network-bitcoin";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskoin-core" = callPackage
@@ -98762,6 +99063,7 @@ self: {
        ];
        description = "Storage and index for Bitcoin and Bitcoin Cash";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskoin-util" = callPackage
@@ -101125,6 +101427,7 @@ self: {
        ];
        description = "Find and annotate ITDs";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "heatitup-complete" = callPackage
@@ -101148,6 +101451,7 @@ self: {
        ];
        description = "Find and annotate ITDs with assembly or read pair joining";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "heatshrink" = callPackage
@@ -101303,6 +101607,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hedgehog_0_6_1" = 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
+     }:
+     mkDerivation {
+       pname = "hedgehog";
+       version = "0.6.1";
+       sha256 = "0xz10ycdm5vk9nrcym1fi83k19frfwqz18bz8bnpzwvaj0j41yfj";
+       libraryHaskellDepends = [
+         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
+       ];
+       testHaskellDepends = [
+         base containers pretty-show semigroups text transformers
+       ];
+       description = "Hedgehog will eat all your bugs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hedgehog-checkers" = callPackage
     ({ mkDerivation, base, containers, either, hedgehog, semigroupoids
      , semigroups
@@ -105751,6 +106082,7 @@ self: {
        benchmarkHaskellDepends = [ base HUnit QuickCheck random ];
        description = "Tests for hmatrix";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmatrix-vector-sized" = callPackage
@@ -109663,17 +109995,20 @@ self: {
      }) {};
 
   "hsc2hs" = callPackage
-    ({ mkDerivation, base, containers, directory, filepath, process }:
+    ({ mkDerivation, base, containers, directory, filepath, process
+     , tasty, tasty-hspec
+     }:
      mkDerivation {
        pname = "hsc2hs";
-       version = "0.68.3";
-       sha256 = "0q46l4mvclw7lys53zljgrcj142rbwzk5zc2djk2qj956ah1i25h";
+       version = "0.68.4";
+       sha256 = "07qzyr1j76gxrrsds65vivm5cx33paxpifvxdlmkxprrm3s4z7z6";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers directory filepath process
        ];
+       testHaskellDepends = [ base tasty tasty-hspec ];
        description = "A preprocessor that helps with writing Haskell bindings to C code";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -111228,14 +111563,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec_2_5_6" = callPackage
+  "hspec_2_5_7" = callPackage
     ({ mkDerivation, base, hspec-core, hspec-discover
      , hspec-expectations, QuickCheck
      }:
      mkDerivation {
        pname = "hspec";
-       version = "2.5.6";
-       sha256 = "0nfs2a0ymh8nw5v5v16qlbf3np8j1rv7nw3jwa9ib7mlqrmfp9ly";
+       version = "2.5.7";
+       sha256 = "1bbxj0bxxhwkzvxg31a8gjyan1px3kx9md4j0ba177g3mk2fnxxy";
        libraryHaskellDepends = [
          base hspec-core hspec-discover hspec-expectations QuickCheck
        ];
@@ -111343,7 +111678,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec-core_2_5_6" = callPackage
+  "hspec-core_2_5_7" = callPackage
     ({ mkDerivation, ansi-terminal, array, base, call-stack, clock
      , deepseq, directory, filepath, hspec-expectations, hspec-meta
      , HUnit, process, QuickCheck, quickcheck-io, random, setenv
@@ -111351,8 +111686,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-core";
-       version = "2.5.6";
-       sha256 = "0pj53qna5x742vnkdlhid7ginqv61awgw4csgb5ay2rd6br8q63g";
+       version = "2.5.7";
+       sha256 = "0rlrc8q92jq3r6qf3bmyy8llz0dv9sdp0n169ni803wzlshaixsn";
        libraryHaskellDepends = [
          ansi-terminal array base call-stack clock deepseq directory
          filepath hspec-expectations HUnit QuickCheck quickcheck-io random
@@ -111426,13 +111761,13 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec-discover_2_5_6" = callPackage
+  "hspec-discover_2_5_7" = callPackage
     ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
      }:
      mkDerivation {
        pname = "hspec-discover";
-       version = "2.5.6";
-       sha256 = "0ilaq6l4gikpv6m82dyzfzhdq2d6x3h5jc7zlmw84jx43asqk5lc";
+       version = "2.5.7";
+       sha256 = "042v6wmxw7dwak6wgr02af1majq6qr5migrp360cm3frjfkw22cx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory filepath ];
@@ -113343,6 +113678,7 @@ self: {
        doHaddock = false;
        description = "Parser for TOML files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "htrace" = callPackage
@@ -119952,6 +120288,8 @@ self: {
        pname = "int-cast";
        version = "0.2.0.0";
        sha256 = "0s8rqm5d9f4y2sskajsw8ff7q8xp52vwqa18m6bajldp11m9a1p0";
+       revision = "1";
+       editedCabalFile = "111pac97pcrp01zphf96crdx22fnq7ha2s27av0mqki5421rghpm";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
@@ -120802,8 +121140,8 @@ self: {
        pname = "io-streams";
        version = "1.5.0.1";
        sha256 = "12rcdg2d70644bvn838fxcjkssqj8pssnx5y657si5rijcbkgjsx";
-       revision = "1";
-       editedCabalFile = "1d7rpwi10rqcry58d4hc651xvk9xzni6n6k22wm9532l14i3x21c";
+       revision = "2";
+       editedCabalFile = "1mcab95d6hm098myh9gp7sh10srigjphgvm8s9pfs7jg5hzghy14";
        configureFlags = [ "-fNoInteractiveTests" ];
        libraryHaskellDepends = [
          attoparsec base bytestring bytestring-builder network primitive
@@ -121269,6 +121607,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "irc-client_1_1_0_5" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, connection, containers
+     , contravariant, exceptions, irc-conduit, irc-ctcp, mtl
+     , network-conduit-tls, old-locale, profunctors, stm, stm-chans
+     , text, time, tls, transformers, x509, x509-store, x509-validation
+     }:
+     mkDerivation {
+       pname = "irc-client";
+       version = "1.1.0.5";
+       sha256 = "13qc5acpkgd80nazlpac3q2viqp76fhq6qjk7fp5dp1w6bhj9qi7";
+       libraryHaskellDepends = [
+         base bytestring conduit connection containers contravariant
+         exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale
+         profunctors stm stm-chans text time tls transformers x509
+         x509-store x509-validation
+       ];
+       description = "An IRC client library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "irc-colors" = callPackage
     ({ mkDerivation, base, text }:
      mkDerivation {
@@ -121841,6 +122200,7 @@ self: {
        ];
        description = "Issue Tracker for the CLI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "itemfield" = callPackage
@@ -122035,10 +122395,12 @@ self: {
     ({ mkDerivation, alg, base, smallcheck, tasty, tasty-smallcheck }:
      mkDerivation {
        pname = "ival";
-       version = "0.1.0.0";
-       sha256 = "16iffzyhqm160sy6qskfxr0wrbjic9bxrm8y9f1ych7gmzp3cdwk";
+       version = "0.2.0.0";
+       sha256 = "1djgkxz6npymkzf5802hdcvr40jlc16pmyxd3qpi98f1c1h4rg5x";
        libraryHaskellDepends = [ alg base ];
-       testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
+       testHaskellDepends = [
+         alg base smallcheck tasty tasty-smallcheck
+       ];
        description = "Intervals";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -123000,6 +123362,7 @@ self: {
        ];
        description = "Unit conversion and manipulation library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jmacro" = callPackage
@@ -124130,8 +124493,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-stream";
-       version = "0.4.2.3";
-       sha256 = "0ijic6vfrpykzy7j3li94fjmaj1vclvp0in1ymb5z5whvljlynw7";
+       version = "0.4.2.4";
+       sha256 = "1ryv2738ajagb0wdkac5lka1kzprrf85gqxabafmm3g5szllxjl1";
        libraryHaskellDepends = [
          aeson base bytestring scientific text unordered-containers vector
        ];
@@ -124553,8 +124916,8 @@ self: {
      }:
      mkDerivation {
        pname = "jukebox";
-       version = "0.4.1";
-       sha256 = "1vpd5j71x85ni6wmvmifb5fw8h3y77l67a3dsngsdcs22jilbbgw";
+       version = "0.4.2";
+       sha256 = "0vxy06dan6iq03p8p2frzvyab5zaahh4pd37rzqg2vh71m6rqka7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -126051,8 +126414,8 @@ self: {
        pname = "keycode";
        version = "0.2.2";
        sha256 = "046k8d1h5wwadf5z4pppjkc3g7v2zxlzb06s1xgixc42y5y41yan";
-       revision = "2";
-       editedCabalFile = "0g19sjk2sh1w9ahn93dnvjkim4mqapq0plmdd37179qfgi49qnp8";
+       revision = "3";
+       editedCabalFile = "18dgbpf3xwdm3x9j63vsr5q7l028qvifgc6jmjf1ar4p2wv1fzz0";
        libraryHaskellDepends = [
          base containers ghc-prim template-haskell
        ];
@@ -127748,20 +128111,20 @@ self: {
 
   "language-ats" = callPackage
     ({ mkDerivation, alex, ansi-wl-pprint, array, base
-     , composition-prelude, containers, cpphs, criterion, deepseq, happy
-     , hspec, hspec-dirstream, microlens, recursion, system-filepath
+     , composition-prelude, containers, criterion, deepseq, happy, hspec
+     , hspec-dirstream, microlens, recursion, system-filepath
      , transformers
      }:
      mkDerivation {
        pname = "language-ats";
-       version = "1.7.0.3";
-       sha256 = "0lmqic0pwn1f5l5zm3830ipyfjv6cj799kzgx0ia0mdy9wh8pfg9";
+       version = "1.7.0.4";
+       sha256 = "1dqmb2wp47smjg55klwb2si8v14yahkrqzgzw9sssla9kyqna46n";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-wl-pprint array base composition-prelude containers deepseq
          microlens recursion transformers
        ];
-       libraryToolDepends = [ alex cpphs happy ];
+       libraryToolDepends = [ alex happy ];
        testHaskellDepends = [
          base hspec hspec-dirstream system-filepath
        ];
@@ -128516,6 +128879,7 @@ self: {
        ];
        description = "Language tools for manipulating OCaml programs in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) zlib;};
 
   "language-openscad" = callPackage
@@ -130717,8 +131081,8 @@ self: {
      }:
      mkDerivation {
        pname = "lhs2tex";
-       version = "1.21";
-       sha256 = "17yfqvsrd2p39fxfmzfvnliwbmkfx5kxmdk0fw5rx9v17acjmnc7";
+       version = "1.22";
+       sha256 = "1g9966m4pw5rp7a83839k46jmih64rn6w0xnmjlrl0df9ddkpsky";
        isLibrary = false;
        isExecutable = true;
        setupHaskellDepends = [
@@ -131107,6 +131471,7 @@ self: {
        ];
        description = "Bindings to the nix package manager";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "libnotify" = callPackage
@@ -131638,6 +132003,7 @@ self: {
        ];
        description = "lifted IO operations from the base library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lifted-protolude" = callPackage
@@ -135273,6 +135639,7 @@ self: {
        ];
        description = "Functional test framework for LSP servers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lss" = callPackage
@@ -135897,8 +136264,8 @@ self: {
        pname = "lzma";
        version = "0.0.0.3";
        sha256 = "0i416gqi8j55nd1pqbkxvf3f6hn6fjys6gq98lkkxphva71j30xg";
-       revision = "2";
-       editedCabalFile = "0c6jkr22w797jvmad9vki2mm7cdzxpqqxkpv836fh5m248nnc618";
+       revision = "3";
+       editedCabalFile = "1sify6gnsalyp6dakfzi0mdy5jcz2kcp9jsdsgkmxd40nfzgd44m";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ lzma ];
        testHaskellDepends = [
@@ -135971,8 +136338,8 @@ self: {
        pname = "lzma-streams";
        version = "0.1.0.0";
        sha256 = "1w8s0xvcz8c3s171gizjkc9iadccjznw7rnfq5wpydkc7x4hxjdn";
-       revision = "2";
-       editedCabalFile = "068k1y57r8vsvm36c682jylv27nsdw646fsx1bkjxccgq7h6mbbb";
+       revision = "3";
+       editedCabalFile = "1zx9y1pls8mnad78ancf52kffyw6ixp9x9bbvp7qfmmi8dc8s90r";
        libraryHaskellDepends = [ base bytestring io-streams lzma ];
        testHaskellDepends = [
          base bytestring HUnit io-streams QuickCheck test-framework
@@ -140023,13 +140390,14 @@ self: {
        pname = "miconix-test";
        version = "0.2";
        sha256 = "02p2m11chfva4i6293if0yf8rvdbxjf8wz38ckmksiicmzhss10y";
-       revision = "2";
-       editedCabalFile = "061f5whj0f9bmqwgnp14zi96ja5c5m28hr56qlcf07pv6rsk5fz6";
+       revision = "3";
+       editedCabalFile = "1rkx448wrvq08qi84g5vqxk3fc27xb4jgwf9vi6hqj5a9gwnjfcg";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ];
-       description = "a";
+       description = "spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "micro-recursion-schemes" = callPackage
@@ -140056,6 +140424,8 @@ self: {
        pname = "microaeson";
        version = "0.1.0.0";
        sha256 = "1hbpyz6p9snnd85h2y0pdqp20svxrggavbv0q8z33sc5i4p8b7iz";
+       revision = "1";
+       editedCabalFile = "0pxgpmr0xv355rnpr8m7l07swbzsjbfiba3dxyz53bdjcc8ya9dq";
        libraryHaskellDepends = [
          array base bytestring containers deepseq text
        ];
@@ -141320,6 +141690,7 @@ self: {
        testToolDepends = [ hspec-discover markdown-unlit ];
        description = "Mixpanel client";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mkbndl" = callPackage
@@ -141448,6 +141819,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion text weigh ];
        description = "Strict markdown processor for writers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mmark_0_0_6_0" = callPackage
@@ -141499,6 +141871,7 @@ self: {
        ];
        description = "Command line interface to MMark markdown processor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mmark-cli_0_0_4_0" = callPackage
@@ -141541,6 +141914,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Commonly useful extensions for the MMark markdown processor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mmorph" = callPackage
@@ -147962,8 +148336,8 @@ self: {
        pname = "netrc";
        version = "0.2.0.0";
        sha256 = "11iax3ick0im397jyyjkny7lax9bgrlgk90a25dp2jsglkphfpls";
-       revision = "4";
-       editedCabalFile = "0g1c3nbalpb7qh6kddir5b84wwg57j2852al2fg5xza3akdd8jsr";
+       revision = "5";
+       editedCabalFile = "0v383hy7iw44xxnpdp2fla2dc8ivrhwgh2m303ps4z9fsw25cyka";
        libraryHaskellDepends = [ base bytestring deepseq parsec ];
        testHaskellDepends = [
          base bytestring tasty tasty-golden tasty-quickcheck
@@ -152511,6 +152885,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "An SQL-generating DSL targeting PostgreSQL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opaleye-classy" = callPackage
@@ -153351,6 +153726,7 @@ self: {
        ];
        description = "An OpenTok SDK for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opentype" = callPackage
@@ -153536,6 +153912,7 @@ self: {
        testHaskellDepends = [ attoparsec-data rerebase ];
        description = "Simple command line interface arguments parser";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "optimal-blocks" = callPackage
@@ -154455,6 +154832,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "packcheck_0_4_0" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "packcheck";
+       version = "0.4.0";
+       sha256 = "1dlvrad746ns76ah07wr9jgw454srag1wjrfp39pld26i70isif6";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       benchmarkHaskellDepends = [ base ];
+       description = "Universal build and CI testing for Haskell packages";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "packdeps" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, directory
      , filepath, optparse-applicative, process, semigroups, split, tar
@@ -155219,8 +155610,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-placetable";
-       version = "0.5";
-       sha256 = "0kjlx2krgwf32y30cca09xnf1h3c91s0pzsv5xf7l8zw85jikxah";
+       version = "0.5.1";
+       sha256 = "0zfqmsq86jvwm4kpjb02whcdxk5xpgaj1sbdh471kr2vz8q4p112";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -155381,15 +155772,16 @@ self: {
      }) {inherit (pkgs.gnome2) pango;};
 
   "pangraph" = callPackage
-    ({ mkDerivation, algebraic-graphs, base, bytestring, containers
-     , hexml, HUnit
+    ({ mkDerivation, algebraic-graphs, attoparsec, base, bytestring
+     , containers, fgl, hexml, html-entities, HUnit, text
      }:
      mkDerivation {
        pname = "pangraph";
-       version = "0.1.2";
-       sha256 = "03iqf77j7a382m7zwkgh872frbii98l04agh6sr4ic96554b0gzl";
+       version = "0.2.0";
+       sha256 = "1zm19gbidi6a27vi7x66dlw3q0syy5vwdykck716kdfka88vr9k5";
        libraryHaskellDepends = [
-         algebraic-graphs base bytestring containers hexml
+         algebraic-graphs attoparsec base bytestring containers fgl hexml
+         html-entities text
        ];
        testHaskellDepends = [ base bytestring containers HUnit ];
        description = "A set of parsers for graph languages and conversions to graph libaries";
@@ -157174,6 +157566,8 @@ self: {
        pname = "paths";
        version = "0.2.0.0";
        sha256 = "18pzjlnmx7w79riig7qzyhw13jla92lals9lwayl23qr02ndna4v";
+       revision = "1";
+       editedCabalFile = "1k477vwhahdgkf3sm2yjl1638qwq6ddm2x10vdf3cq48js2pkrw5";
        libraryHaskellDepends = [
          base bytestring deepseq directory filepath template-haskell text
          time
@@ -158456,6 +158850,7 @@ self: {
        ];
        description = "Permutations of finite sets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "permute" = callPackage
@@ -159991,8 +160386,8 @@ self: {
      }:
      mkDerivation {
        pname = "pier";
-       version = "0.2.0.1";
-       sha256 = "0j26bwm58lh0dddn0595hr6pq9f8plkvg670k3g0va1aqbd2i48k";
+       version = "0.3.0.0";
+       sha256 = "1rv5k8apxshh8kbbbjzcw23bfx819634ryz83jp2iqhixlgcqz69";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -160013,8 +160408,8 @@ self: {
      }:
      mkDerivation {
        pname = "pier-core";
-       version = "0.2.0.1";
-       sha256 = "1kd6z5vw2v61kpgpf95a8hs4m97lnydsl2k0xqxq5bg59q281b64";
+       version = "0.3.0.0";
+       sha256 = "0sxdswnkxhdcfcg4xq11lvgsip05nr4qd361qdrw2nxafq9q3dnj";
        libraryHaskellDepends = [
          base base64-bytestring binary bytestring Cabal containers
          cryptohash-sha256 directory hashable http-client http-client-tls
@@ -161405,6 +161800,7 @@ self: {
        ];
        description = "Haskell game engine like fantasy console";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pkcs1" = callPackage
@@ -161629,6 +162025,7 @@ self: {
        ];
        description = "Planet Mitchell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plankton" = callPackage
@@ -163732,8 +164129,8 @@ self: {
      }:
      mkDerivation {
        pname = "postgresql-simple-opts";
-       version = "0.3.0.0";
-       sha256 = "1lr9jj2dv01njjv2iqvirim1gv8bgb5pzaipni04f1dr5bhgkfhd";
+       version = "0.3.0.1";
+       sha256 = "19jhrz2lghiycb81dzzz5g2kwzaahn27q7diw6nn9qmcpwgw3rly";
        libraryHaskellDepends = [
          base bytestring data-default either generic-deriving
          optparse-applicative optparse-generic postgresql-simple split
@@ -165323,6 +165720,7 @@ self: {
        ];
        description = "prim typeclass instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prim-ref" = callPackage
@@ -167245,6 +167643,7 @@ self: {
        ];
        doHaddock = false;
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "proto-lens-setup" = callPackage
@@ -167261,6 +167660,7 @@ self: {
        ];
        description = "Cabal support for codegen with proto-lens";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "protobuf" = callPackage
@@ -168324,6 +168724,7 @@ self: {
        ];
        description = "Isomorphic trivial data type definitions over JSON";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "purescript-tsd-gen" = callPackage
@@ -169942,6 +170343,7 @@ self: {
        libraryHaskellDepends = [ base QuickCheck template-haskell ];
        description = "Get counterexamples from QuickCheck as Haskell values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quicklz" = callPackage
@@ -170492,6 +170894,7 @@ self: {
        ];
        description = "Radix tree data structive over short byte-strings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "radixtree" = callPackage
@@ -181641,6 +182044,7 @@ self: {
        executableHaskellDepends = [ base bytestring ];
        description = "Fast CSV lexing on ByteString";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scyther-proof" = callPackage
@@ -183600,6 +184004,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-auth-server_0_4_0_1" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder
+     , bytestring, bytestring-conversion, case-insensitive, cookie
+     , crypto-api, data-default-class, entropy, hspec, hspec-discover
+     , http-api-data, http-client, http-types, jose, lens, lens-aeson
+     , markdown-unlit, monad-time, mtl, QuickCheck, servant
+     , servant-auth, servant-server, tagged, text, time, transformers
+     , unordered-containers, wai, warp, wreq
+     }:
+     mkDerivation {
+       pname = "servant-auth-server";
+       version = "0.4.0.1";
+       sha256 = "196dcnh1ycb23x6wb5m1p3iy8bws2grlx5i9mnnsav9n95yf15n9";
+       libraryHaskellDepends = [
+         aeson base base64-bytestring blaze-builder bytestring
+         bytestring-conversion case-insensitive cookie crypto-api
+         data-default-class entropy http-api-data http-types jose lens
+         monad-time mtl servant servant-auth servant-server tagged text time
+         unordered-containers wai
+       ];
+       testHaskellDepends = [
+         aeson base bytestring case-insensitive hspec http-client http-types
+         jose lens lens-aeson markdown-unlit mtl QuickCheck servant-auth
+         servant-server time transformers wai warp wreq
+       ];
+       testToolDepends = [ hspec-discover markdown-unlit ];
+       description = "servant-server/servant-auth compatibility";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-auth-swagger" = callPackage
     ({ mkDerivation, base, hspec, hspec-discover, lens, QuickCheck
      , servant, servant-auth, servant-swagger, swagger2, text
@@ -184263,6 +184698,7 @@ self: {
        testHaskellDepends = [ base ];
        description = "Servant authentication with HMAC";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-iCalendar" = callPackage
@@ -188330,8 +188766,8 @@ self: {
      }:
      mkDerivation {
        pname = "simple-sql-parser";
-       version = "0.4.3";
-       sha256 = "125k5vz05spmyd5gws1sfrqamp4pnbpyim21mvz1vx8avj548xi8";
+       version = "0.4.4";
+       sha256 = "1j1p94mfb7kzrayi39xcwmagxcf5j9lvxi7niqxc5jr70958csnl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mtl parsec pretty ];
@@ -189266,6 +189702,7 @@ self: {
        ];
        description = "A very quick-and-dirty WebSocket server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "skip-list" = callPackage
@@ -192131,6 +192568,7 @@ self: {
        librarySystemDepends = [ softfloat ];
        description = "Haskell bindings for SoftFloat";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {softfloat = null;};
 
   "solga" = callPackage
@@ -194779,6 +195217,7 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Convert stack.yaml files into Nix build instructions.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stackage" = callPackage
@@ -196004,12 +196443,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "stm_2_4_5_1" = callPackage
+  "stm_2_5_0_0" = callPackage
     ({ mkDerivation, array, base }:
      mkDerivation {
        pname = "stm";
-       version = "2.4.5.1";
-       sha256 = "1x53lg07j6d42vnmmk2f9sfqx2v4hxjk3hm11fccjdi70s0c5w3c";
+       version = "2.5.0.0";
+       sha256 = "1illcj8zgzmpl91hzgk0j74ha436a379gw13siq4gifbcrf6iqsr";
        libraryHaskellDepends = [ array base ];
        description = "Software Transactional Memory";
        license = stdenv.lib.licenses.bsd3;
@@ -196290,6 +196729,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "stm-split_0_0_2_1" = callPackage
+    ({ mkDerivation, base, stm }:
+     mkDerivation {
+       pname = "stm-split";
+       version = "0.0.2.1";
+       sha256 = "06c41p01x62p79bzwryjxr34l7cj65gl227fwwsvd9l6ihk8grp8";
+       libraryHaskellDepends = [ base stm ];
+       description = "TMVars, TVars and TChans with distinguished input and output side";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "stm-stats" = callPackage
     ({ mkDerivation, base, containers, stm, template-haskell, time }:
      mkDerivation {
@@ -203173,12 +203624,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "template-haskell_2_13_0_0" = callPackage
+  "template-haskell_2_14_0_0" = callPackage
     ({ mkDerivation, base, ghc-boot-th, pretty }:
      mkDerivation {
        pname = "template-haskell";
-       version = "2.13.0.0";
-       sha256 = "0j61d0xnlsywgn33k72a6dmnp9i93zjn0gba1fhxs9qwdb1xcfk3";
+       version = "2.14.0.0";
+       sha256 = "1y8l2g95mhd2j09bq05q2rj6rn2ni86yhf4kgha3y5qig7j8lyy9";
        libraryHaskellDepends = [ base ghc-boot-th pretty ];
        description = "Support library for Template Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -204664,7 +205115,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "text_1_2_3_0" = callPackage
+  "text_1_2_3_1" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, deepseq
      , directory, ghc-prim, HUnit, integer-gmp, QuickCheck
      , quickcheck-unicode, random, test-framework, test-framework-hunit
@@ -204672,8 +205123,8 @@ self: {
      }:
      mkDerivation {
        pname = "text";
-       version = "1.2.3.0";
-       sha256 = "06iir7q99rnffzxi8gagn8w1k9m49368sbidgz634fv1gxib3q10";
+       version = "1.2.3.1";
+       sha256 = "19j725g8xma1811avl3nz2vndwynsmpx3sqf6bd7iwh1bm6n4q43";
        libraryHaskellDepends = [
          array base binary bytestring deepseq ghc-prim integer-gmp
        ];
@@ -204961,6 +205412,7 @@ self: {
        ];
        description = "ICU transliteration";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) icu;};
 
   "text-json-qq" = callPackage
@@ -205106,8 +205558,8 @@ self: {
        pname = "text-metrics";
        version = "0.3.0";
        sha256 = "18mzxwkdvjp31r720ai9bnxr638qq8x3a2v408bz0d8f0rsayx1q";
-       revision = "3";
-       editedCabalFile = "0wgkpc8zsfgc8rwbzylpf7r2nnrwhw6rani2chzc9r7lfygpqmn1";
+       revision = "4";
+       editedCabalFile = "017drxq9x56b345d8w5m8xdsi1zzs0z16pbdx8j35cd1lsnh3kf1";
        libraryHaskellDepends = [ base containers text vector ];
        testHaskellDepends = [ base hspec QuickCheck text ];
        benchmarkHaskellDepends = [ base criterion deepseq text weigh ];
@@ -205848,6 +206300,8 @@ self: {
        pname = "th-expand-syns";
        version = "0.4.4.0";
        sha256 = "01prlvh3py5hq5ccjidfyp9ixq2zd88dkbsidyjrpkja6v8m43yc";
+       revision = "1";
+       editedCabalFile = "1zbdg3hrqv7rzlsrw4a2vjr3g4nzny32wvjcpxamlvx77b1jvsw9";
        libraryHaskellDepends = [ base containers syb template-haskell ];
        testHaskellDepends = [ base template-haskell ];
        description = "Expands type synonyms in Template Haskell ASTs";
@@ -208314,12 +208768,13 @@ self: {
 
   "tldr" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, cmark, directory
-     , filepath, optparse-applicative, semigroups, text, typed-process
+     , filepath, optparse-applicative, semigroups, tasty, tasty-golden
+     , text, typed-process
      }:
      mkDerivation {
        pname = "tldr";
-       version = "0.3.0";
-       sha256 = "1wnc1l1c9d56y64d5hlkj2z1m4vl87shfya7ix49h22l77df0jq7";
+       version = "0.4.0";
+       sha256 = "017x3lqphbyayl9gx9ykn62i73xzb180df0a8r6ic6chk6yhivfg";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -208329,7 +208784,7 @@ self: {
          base directory filepath optparse-applicative semigroups
          typed-process
        ];
-       testHaskellDepends = [ base ];
+       testHaskellDepends = [ base tasty tasty-golden ];
        description = "Haskell tldr client";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -208716,6 +209171,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "TokTok C code style checker";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "toktok" = callPackage
@@ -208870,6 +209326,7 @@ self: {
        ];
        description = "Command-line tool to check syntax of TOML files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "toolshed" = callPackage
@@ -209377,6 +209834,7 @@ self: {
          base hedgehog mmorph postgresql-simple resource-pool text
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tracy" = callPackage
@@ -211127,6 +211585,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "turtle_1_5_11" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
+     , containers, criterion, directory, doctest, exceptions, foldl
+     , hostname, managed, optional-args, optparse-applicative, process
+     , semigroups, stm, system-fileio, system-filepath, temporary, text
+     , time, transformers, unix, unix-compat
+     }:
+     mkDerivation {
+       pname = "turtle";
+       version = "1.5.11";
+       sha256 = "19jn9k70qwhdlzkm8kq1jq37i8ck3q4fnkzn1x75prwhs60rgr0f";
+       libraryHaskellDepends = [
+         ansi-wl-pprint async base bytestring clock containers directory
+         exceptions foldl hostname managed optional-args
+         optparse-applicative process semigroups stm system-fileio
+         system-filepath temporary text time transformers unix unix-compat
+       ];
+       testHaskellDepends = [ base doctest system-filepath temporary ];
+       benchmarkHaskellDepends = [ base criterion text ];
+       description = "Shell programming, Haskell-style";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "turtle-options" = callPackage
     ({ mkDerivation, base, HUnit, optional-args, parsec, text, turtle
      }:
@@ -211185,6 +211667,7 @@ self: {
        ];
        description = "An equational theorem prover";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twee-lib" = callPackage
@@ -211211,8 +211694,8 @@ self: {
      }:
      mkDerivation {
        pname = "tweet-hs";
-       version = "1.0.1.42";
-       sha256 = "1jf3w8cw9nmg6b2wxs5agxxi1igfsykj857cjkqjsfr04z060v37";
+       version = "1.0.1.43";
+       sha256 = "10bxkllxiwm1xbvpz4wh1gd24qkz8y0b7z4ciwqk13jz5ha966x0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -213222,8 +213705,8 @@ self: {
        pname = "uhttpc";
        version = "0.1.1.0";
        sha256 = "1knf8r8zq8nnidmbj1blazjxkpngczs55jjx0phnnxlc026ppynb";
-       revision = "3";
-       editedCabalFile = "1s35m2mrcaamj0293yb78ya185fzm71zdx0jq62im7rc5fdhfiry";
+       revision = "4";
+       editedCabalFile = "0g4rcm7kbanayv18bad7pakrnghqg2qpxq4aib1n4d8h7ximgly2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -213538,6 +214021,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "unescaping-print" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "unescaping-print";
+       version = "0.1";
+       sha256 = "0a1ryvnpgsk668wagwwapksi7i9kbhhjfpqlvmg2z9kv1anr6mp5";
+       libraryHaskellDepends = [ base ];
+       description = "Tiny package providing unescaping versions of show and print";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "unexceptionalio" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -213569,8 +214063,8 @@ self: {
        pname = "unfoldable";
        version = "0.9.6";
        sha256 = "18gaay37mjgyd5rfpfs84p4q7vqdnv4lcjabaprgm315pblym46d";
-       revision = "1";
-       editedCabalFile = "1lgyfmv339zfkrf6s4bw1ksk0757vcc1vx07yc4l33idmpsgz77c";
+       revision = "2";
+       editedCabalFile = "08rx8ci2jpa77q1dl4lghlyhd27if990ic9kaz30hczsazlzi44b";
        libraryHaskellDepends = [
          base containers ghc-prim one-liner QuickCheck random transformers
        ];
@@ -214455,8 +214949,8 @@ self: {
        pname = "unix";
        version = "2.7.2.2";
        sha256 = "1b6ygkasn5bvmdci8g3zjkahl34kfqhf5jrayibvnrcdnaqlxpcq";
-       revision = "1";
-       editedCabalFile = "0cag1vm2pmzgy0v1j27lhp37iipck06n6gjlphpl26p5xw3gwd31";
+       revision = "2";
+       editedCabalFile = "0d6dv944rp8g69p336b1ik9xl1f182jd8lz82ykhfjhasw8d1waf";
        libraryHaskellDepends = [ base bytestring time ];
        description = "POSIX functionality";
        license = stdenv.lib.licenses.bsd3;
@@ -214635,6 +215129,8 @@ self: {
        pname = "unliftio";
        version = "0.2.8.0";
        sha256 = "04i03j1ffa3babh0i79zzvxk7xnm4v8ci0mpfzc4dm7m65cwk1h5";
+       revision = "1";
+       editedCabalFile = "1l9hncv1pavdqyy1zmjfypqd23m243x5fiid7vh1rki71fdlh9z0";
        libraryHaskellDepends = [
          async base deepseq directory filepath process stm time transformers
          unix unliftio-core
@@ -214647,12 +215143,37 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "unliftio_0_2_8_1" = callPackage
+    ({ mkDerivation, async, base, deepseq, directory, filepath, hspec
+     , process, stm, time, transformers, unix, unliftio-core
+     }:
+     mkDerivation {
+       pname = "unliftio";
+       version = "0.2.8.1";
+       sha256 = "18v8rzm2nxpck5xvg8qixkarhliy16yswgvj6vbjzq8bn4n6nydz";
+       revision = "1";
+       editedCabalFile = "1zx2h1mnjcjszjdchg17gqrnj3d56x46947jm92snmdjw8x231wg";
+       libraryHaskellDepends = [
+         async base deepseq directory filepath process stm time transformers
+         unix unliftio-core
+       ];
+       testHaskellDepends = [
+         async base deepseq directory filepath hspec process stm time
+         transformers unix unliftio-core
+       ];
+       description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "unliftio-core" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "unliftio-core";
        version = "0.1.2.0";
        sha256 = "0y3siyx3drkw7igs380a87h8qfbbgcyxxlcnshp698hcc4yqphr4";
+       revision = "1";
+       editedCabalFile = "0s6xfg9d0i3sfil5gjbamlq017wdxa69csk73bcqjkficg43vm29";
        libraryHaskellDepends = [ base transformers ];
        description = "The MonadUnliftIO typeclass for unlifting monads to IO";
        license = stdenv.lib.licenses.mit;
@@ -215899,6 +216420,7 @@ self: {
        libraryHaskellDepends = [ base basic control lifted-base-tf util ];
        description = "Exceptional utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "util-plus" = callPackage
@@ -215926,6 +216448,7 @@ self: {
        libraryHaskellDepends = [ base primitive ];
        description = "Primitive memory-related utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "util-primitive-control" = callPackage
@@ -215941,6 +216464,7 @@ self: {
        doHaddock = false;
        description = "Utilities for stateful primitive types and types based on them";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "util-universe" = callPackage
@@ -216971,6 +217495,7 @@ self: {
        ];
        description = "A monad transformer for vault-tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vaultaire-common" = callPackage
@@ -219909,6 +220434,7 @@ self: {
        testHaskellDepends = [ base doctest prometheus-client ];
        description = "WAI middlware for exposing http://prometheus.io metrics.";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-rollbar" = callPackage
@@ -222388,6 +222914,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wild-bind_0_1_2_2" = callPackage
+    ({ mkDerivation, base, containers, hspec, microlens, QuickCheck
+     , semigroups, stm, text, transformers
+     }:
+     mkDerivation {
+       pname = "wild-bind";
+       version = "0.1.2.2";
+       sha256 = "0s1hwgc1fzr2mgls6na6xsc51iw8xp11ydwgwcaqq527gcij101p";
+       libraryHaskellDepends = [
+         base containers semigroups text transformers
+       ];
+       testHaskellDepends = [
+         base hspec microlens QuickCheck stm transformers
+       ];
+       description = "Dynamic key binding framework";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wild-bind-indicator" = callPackage
     ({ mkDerivation, base, containers, gtk, text, transformers
      , wild-bind
@@ -222439,6 +222984,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wild-bind-x11_0_2_0_5" = callPackage
+    ({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl
+     , semigroups, stm, text, time, transformers, wild-bind, X11
+     }:
+     mkDerivation {
+       pname = "wild-bind-x11";
+       version = "0.2.0.5";
+       sha256 = "0r9nlv96f1aavigd70r33q11a125kn3zah17z5vvsjlw55br0wxy";
+       libraryHaskellDepends = [
+         base containers fold-debounce mtl semigroups stm text transformers
+         wild-bind X11
+       ];
+       testHaskellDepends = [
+         async base hspec text time transformers wild-bind X11
+       ];
+       description = "X11-specific implementation for WildBind";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wilton-ffi" = callPackage
     ({ mkDerivation, aeson, base, bytestring, utf8-string }:
      mkDerivation {
@@ -222470,8 +223035,8 @@ self: {
        pname = "windns";
        version = "0.1.0.0";
        sha256 = "1hphwmwc1182p5aqjswcgqjbilm91rv5svjqhd93cqq599gg8q0c";
-       revision = "2";
-       editedCabalFile = "19n1nb65mgz9rdp37z7sdmjxwcl2wnlrflqcwbhr99ly2anx0sy7";
+       revision = "3";
+       editedCabalFile = "0j6gqyvhv7hxm5n249nrv0d9r41qb0yc4qdrzkjgs6lchndi6mrp";
        libraryHaskellDepends = [ base bytestring deepseq ];
        librarySystemDepends = [ dnsapi ];
        description = "Domain Name Service (DNS) lookup via the Windows dnsapi standard library";
@@ -222796,6 +223361,7 @@ self: {
        ];
        description = "A parser of WKT, WKB and eWKB";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wl-pprint" = callPackage
@@ -223875,6 +224441,7 @@ self: {
        testHaskellDepends = [ base bytestring envy hspec skews text ];
        description = "A-little-higher-level WebSocket client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wtk" = callPackage
@@ -230756,6 +231323,7 @@ self: {
        ];
        description = "More constrained extensions to zeromq4-haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zeroth" = callPackage
@@ -230962,6 +231530,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "zip_1_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive
+     , cereal, conduit, conduit-extra, containers, digest, directory
+     , dlist, exceptions, filepath, hspec, monad-control, mtl
+     , QuickCheck, resourcet, temporary, text, time, transformers
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "zip";
+       version = "1.2.0";
+       sha256 = "1jbxnbiizdklv0pw8f22h38xbmk6d4wggy27w8injdsfi18f27dn";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring bzlib-conduit case-insensitive cereal conduit
+         conduit-extra containers digest directory dlist exceptions filepath
+         monad-control mtl resourcet text time transformers
+         transformers-base
+       ];
+       executableHaskellDepends = [ base filepath ];
+       testHaskellDepends = [
+         base bytestring conduit containers directory dlist exceptions
+         filepath hspec QuickCheck temporary text time transformers
+       ];
+       description = "Operations on zip archives";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "zip-archive" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, Cabal, containers
      , digest, directory, filepath, HUnit, mtl, pretty, process
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 32899b748113..4131e5f7a27c 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -47,10 +47,24 @@ let
   # To avoid library name collisions
   layout = if taggedLayout then "tagged" else "system";
 
+  # Versions of b2 before 1.65 have job limits; specifically:
+  #   - Versions before 1.58 support up to 64 jobs[0]
+  #   - Versions before 1.65 support up to 256 jobs[1]
+  #
+  # [0]: https://github.com/boostorg/build/commit/0ef40cb86728f1cd804830fef89a6d39153ff632
+  # [1]: https://github.com/boostorg/build/commit/316e26ca718afc65d6170029284521392524e4f8
+  jobs =
+    if versionOlder version "1.58" then
+      "$(($NIX_BUILD_CORES<=64 ? $NIX_BUILD_CORES : 64))"
+    else if versionOlder version "1.65" then
+      "$(($NIX_BUILD_CORES<=256 ? $NIX_BUILD_CORES : 256))"
+    else
+      "$NIX_BUILD_CORES";
+
   b2Args = concatStringsSep " " ([
     "--includedir=$dev/include"
     "--libdir=$out/lib"
-    "-j$NIX_BUILD_CORES"
+    "-j${jobs}"
     "--layout=${layout}"
     "variant=${variant}"
     "threading=${threading}"
diff --git a/pkgs/development/libraries/gtk-sharp/3.0.nix b/pkgs/development/libraries/gtk-sharp/3.0.nix
index 3a473d6303ad..f8f1f20cc2fd 100644
--- a/pkgs/development/libraries/gtk-sharp/3.0.nix
+++ b/pkgs/development/libraries/gtk-sharp/3.0.nix
@@ -47,5 +47,6 @@ stdenv.mkDerivation {
 
   meta = {
     platforms = stdenv.lib.platforms.linux;
+    broken = true; # 2018-09-21, build has failed since 2018-04-28
   };
 }
diff --git a/pkgs/development/libraries/herqq/default.nix b/pkgs/development/libraries/herqq/default.nix
index 75dd8693d2cf..a5f8f00a6bfd 100644
--- a/pkgs/development/libraries/herqq/default.nix
+++ b/pkgs/development/libraries/herqq/default.nix
@@ -20,5 +20,6 @@ stdenv.mkDerivation rec {
     description = "A software library for building UPnP devices and control points";
     platforms = platforms.linux;
     maintainers = [ ];
+    broken = true; # 2018-09-21, built with qt510 (which was removed) but neither qt59 nor qt511
   };
 }
diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix
index 22debc6d68aa..9e7d608b5124 100644
--- a/pkgs/development/libraries/libcef/default.nix
+++ b/pkgs/development/libraries/libcef/default.nix
@@ -14,12 +14,10 @@ let
 in
 stdenv.mkDerivation rec {
   name = "cef-binary-${version}";
-  # Not very recent but more recent versions have problems:
-  # https://github.com/bazukas/obs-linuxbrowser/issues/63
-  version = "3.3325.1750.gaabe4c4";
+  version = "3.3497.1833.g13f506f";
   src = fetchurl {
     url = "http://opensource.spotify.com/cefbuilds/cef_binary_${version}_linux64.tar.bz2";
-    sha256 = "06pj1ci1lwammz1vwmbgw2fri7gkvbpv4iw67pqckd9xz0cfhwzr";
+    sha256 = "02v22yx1ga2yxagjblzkfw0ax7zkrdpc959l1a15m8nah3y7xf9p";
   };
   nativeBuildInputs = [ cmake ];
   makeFlags = "libcef_dll_wrapper";
diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix
index 25e55e45d1e2..ffd195b6462d 100644
--- a/pkgs/development/libraries/libpfm/default.nix
+++ b/pkgs/development/libraries/libpfm/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
 
   installFlags = "DESTDIR=\${out} PREFIX= LDCONFIG=true";
 
+  NIX_CFLAGS_COMPILE = [ "-Wno-error" ];
+
   meta = with stdenv.lib; {
     description = "Helper library to program the performance monitoring events";
     longDescription = ''
diff --git a/pkgs/development/libraries/libtins/default.nix b/pkgs/development/libraries/libtins/default.nix
index efd63148fb10..1af7548ac962 100644
--- a/pkgs/development/libraries/libtins/default.nix
+++ b/pkgs/development/libraries/libtins/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libtins-${version}";
-  version = "3.5";
+  version = "4.0";
   
   src = fetchFromGitHub {
     owner = "mfontanini";
     repo = "libtins";
     rev = "v${version}";
-    sha256 = "00d1fxyg8q6djljm79ms69gcrsqxxksny3b16v99bzf3aivfss5x";
+    sha256 = "13sdqad976j7gq2k1il6g51yxwr8rlqdkzf1kj9mzhihjq8541qs";
   };
 
   postPatch = ''
diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix
index 7f89c92772c3..11a2640e97c8 100644
--- a/pkgs/development/libraries/physics/lhapdf/default.nix
+++ b/pkgs/development/libraries/physics/lhapdf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python2 }:
+{ stdenv, fetchurl, python2, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "lhapdf-${version}";
@@ -9,6 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0bi02xcmq5as0wf0jn6i3hx0qy0hj61m02sbrbzd1gwjhpccwmvd";
   };
 
+  nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ python2 ];
 
   enableParallelBuilding = true;
@@ -17,6 +18,10 @@ stdenv.mkDerivation rec {
     pdf_sets = import ./pdf_sets.nix { inherit stdenv fetchurl; };
   };
 
+  postInstall = ''
+    wrapProgram $out/bin/lhapdf --prefix PYTHONPATH : "$(toPythonPath "$out")"
+  '';
+
   meta = {
     description = "A general purpose interpolator, used for evaluating Parton Distribution Functions from discretised data files";
     license     = stdenv.lib.licenses.gpl2;
diff --git a/pkgs/development/libraries/protobuf/3.6.nix b/pkgs/development/libraries/protobuf/3.6.nix
new file mode 100644
index 000000000000..0009209d9cef
--- /dev/null
+++ b/pkgs/development/libraries/protobuf/3.6.nix
@@ -0,0 +1,6 @@
+{ callPackage, ... }:
+
+callPackage ./generic-v3.nix {
+  version = "3.6.1";
+  sha256 = "1bg40miylzpy2wgbd7l7zjgmk43l12q38fq0zkn0vzy1lsj457sq";
+}
diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix
index 5f0006c05894..79e4c387cdf5 100644
--- a/pkgs/development/libraries/protobuf/generic-v3.nix
+++ b/pkgs/development/libraries/protobuf/generic-v3.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   # make sure you test also -A pythonPackages.protobuf
   src = fetchFromGitHub {
-    owner = "google";
+    owner = "protocolbuffers";
     repo = "protobuf";
     rev = "v${version}";
     inherit sha256;
diff --git a/pkgs/development/libraries/protobufc/1.3.nix b/pkgs/development/libraries/protobufc/1.3.nix
index 803f5a9ba79c..4d53c42a3478 100644
--- a/pkgs/development/libraries/protobufc/1.3.nix
+++ b/pkgs/development/libraries/protobufc/1.3.nix
@@ -1,11 +1,11 @@
 { callPackage, fetchFromGitHub, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "1.3.0";
+  version = "1.3.1";
   src = fetchFromGitHub {
     owner = "protobuf-c";
     repo = "protobuf-c";
     rev = "v${version}";
-    sha256 = "0shk18rjhzn2lqrwk97ks3x8gj77isc8szyb3xsgjrbrvkzjgvaa";
+    sha256 = "1dmvs0bhyx94ipaq3c7jmwcz4hwjmznn7310kqkqx7ly0w5vxxxr";
   };
 })
diff --git a/pkgs/development/libraries/qgnomeplatform/default.nix b/pkgs/development/libraries/qgnomeplatform/default.nix
new file mode 100644
index 000000000000..3a3d3e0277c9
--- /dev/null
+++ b/pkgs/development/libraries/qgnomeplatform/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, pkgconfig, gtk3, qtbase, qmake }:
+
+stdenv.mkDerivation rec {
+  name = "qgnomeplatform-${version}";
+  version = "0.4";
+
+  src = fetchFromGitHub {
+    owner = "FedoraQt";
+    repo = "QGnomePlatform";
+    rev = version;
+    sha256 = "1403300d435g7ngcxsgnllhryk63nrhl1ahx16b28wkxnh2vi9ly";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    qmake
+  ];
+
+  buildInputs = [
+    gtk3
+    qtbase
+  ];
+
+  postPatch = ''
+    # Fix plugin dir
+    substituteInPlace qgnomeplatform.pro \
+      --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "QPlatformTheme for a better Qt application inclusion in GNOME";
+    homepage = https://github.com/FedoraQt/QGnomePlatform;
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ worldofpeace ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index 453ad884b423..b050a19db37b 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -60,7 +60,7 @@ let
       TARGET = "ATHLON";
       DYNAMIC_ARCH = "1";
       CC = "gcc";
-      USE_OPENMP = if stdenv.hostPlatform.isMusl then "0" else "1";
+      USE_OPENMP = "1";
     };
   };
 in
diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/pkgs/development/libraries/virglrenderer/default.nix
index 2cd3b5a20c0c..4473100a9f20 100644
--- a/pkgs/development/libraries/virglrenderer/default.nix
+++ b/pkgs/development/libraries/virglrenderer/default.nix
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
 
   name = "virglrenderer-${version}";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/virgl/${name}.tar.bz2";
-    sha256 = "a549e351e0eb2ad1df471386ddcf85f522e7202808d1616ee9ff894209066e1a";
+    sha256 = "041agg1d6i8hg250y30f08n3via0hs9rbijxdrfifb8ara805v0m";
   };
 
   buildInputs = [ libGLU epoxy libX11 libdrm mesa_noglu ];
diff --git a/pkgs/development/python-modules/click-completion/default.nix b/pkgs/development/python-modules/click-completion/default.nix
new file mode 100644
index 000000000000..a6b36232531b
--- /dev/null
+++ b/pkgs/development/python-modules/click-completion/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k,
+  click, jinja2, shellingham, six
+}:
+
+buildPythonPackage rec {
+  pname = "click-completion";
+  version = "0.4.1";
+  disabled = (!isPy3k);
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1fjm22dyma26jrx4ki2z4dwbhcah4r848fz381x64sz5xxq3xdrk";
+  };
+
+  propagatedBuildInputs = [ click jinja2 shellingham six ];
+
+  meta = with stdenv.lib; {
+    description = "Add or enhance bash, fish, zsh and powershell completion in Click";
+    homepage = https://github.com/click-contrib/click-completion;
+    license = licenses.mit;
+    maintainers = with maintainers; [ mbode ];
+  };
+}
diff --git a/pkgs/development/python-modules/click-didyoumean/default.nix b/pkgs/development/python-modules/click-didyoumean/default.nix
new file mode 100644
index 000000000000..4cd2ea15029b
--- /dev/null
+++ b/pkgs/development/python-modules/click-didyoumean/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchPypi,
+  click
+}:
+
+buildPythonPackage rec {
+  pname = "click-didyoumean";
+  version = "0.0.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1svaza5lpvdbmyrx5xi0riqzq4hb9wnlpqrg6r8zy14pbi42j8hi";
+  };
+
+  propagatedBuildInputs = [ click ];
+
+  meta = with stdenv.lib; {
+    description = "Enable git-like did-you-mean feature in click";
+    homepage = https://github.com/click-contrib/click-didyoumean;
+    license = licenses.mit;
+    maintainers = with maintainers; [ mbode ];
+  };
+}
diff --git a/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/pkgs/development/python-modules/elasticsearch-dsl/default.nix
new file mode 100644
index 000000000000..94d47073764e
--- /dev/null
+++ b/pkgs/development/python-modules/elasticsearch-dsl/default.nix
@@ -0,0 +1,39 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+, elasticsearch
+, ipaddress
+, python-dateutil
+, pytz
+, six
+}:
+
+buildPythonPackage rec {
+  pname = "elasticsearch-dsl";
+  version = "6.2.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0f0w23kzyym0fkzisdkcl4xpnm8fsi97v1kskyvfrhj3mxy179fh";
+  };
+
+  propagatedBuildInputs = [ elasticsearch python-dateutil six ]
+                          ++ stdenv.lib.optional (!isPy3k) ipaddress;
+
+  # ImportError: No module named test_elasticsearch_dsl
+  # Tests require a local instance of elasticsearch
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "High level Python client for Elasticsearch";
+    longDescription = ''
+      Elasticsearch DSL is a high-level library whose aim is to help with
+      writing and running queries against Elasticsearch. It is built on top of
+      the official low-level client (elasticsearch-py).
+    '';
+    homepage = https://github.com/elasticsearch/elasticsearch-dsl-py;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ desiderius ];
+  };
+}
diff --git a/pkgs/development/python-modules/ldappool/default.nix b/pkgs/development/python-modules/ldappool/default.nix
index a09fa75ce349..02d10b832ff2 100644
--- a/pkgs/development/python-modules/ldappool/default.nix
+++ b/pkgs/development/python-modules/ldappool/default.nix
@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   name = "ldappool-${version}";
-  version = "2.3.0";
+  version = "2.2.0";
 
   src = fetchPypi {
     pname = "ldappool";
     inherit version;
-    sha256 = "899d38e891372981166350c813ff5ce2ad8ac383311edccda8102362c1d60952";
+    sha256 = "1akmzf51cjfvmd0nvvm562z1w9vq45zsx6fa72kraqgsgxhnrhqz";
   };
 
   nativeBuildInputs = [ pbr ];
diff --git a/pkgs/development/python-modules/py3exiv2/default.nix b/pkgs/development/python-modules/py3exiv2/default.nix
index d8633488102b..4c6ca0bad338 100644
--- a/pkgs/development/python-modules/py3exiv2/default.nix
+++ b/pkgs/development/python-modules/py3exiv2/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, isPy3k, fetchPypi, stdenv, exiv2, boost, libcxx }:
+{ buildPythonPackage, isPy3k, fetchPypi, stdenv, exiv2, boost, libcxx, substituteAll, python }:
 
 buildPythonPackage rec {
   pname = "py3exiv2";
@@ -16,7 +16,12 @@ buildPythonPackage rec {
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
 
   # fix broken libboost_python3 detection
-  patches = [ ./setup.patch ];
+  patches = [
+    (substituteAll {
+      src = ./setup.patch;
+      version = "3${stdenv.lib.versions.minor python.version}";
+    })
+  ];
 
   meta = {
     homepage = "https://launchpad.net/py3exiv2";
diff --git a/pkgs/development/python-modules/py3exiv2/setup.patch b/pkgs/development/python-modules/py3exiv2/setup.patch
index bb4b11523479..8b0619c5bc5f 100644
--- a/pkgs/development/python-modules/py3exiv2/setup.patch
+++ b/pkgs/development/python-modules/py3exiv2/setup.patch
@@ -5,7 +5,7 @@
                      return l.replace('libboost', 'boost')
  
 -libboost = get_libboost_name()
-+libboost = 'boost_python3'
++libboost = 'boost_python@version@'
  
  setup(
      name='py3exiv2',
diff --git a/pkgs/development/python-modules/sharedmem/default.nix b/pkgs/development/python-modules/sharedmem/default.nix
new file mode 100644
index 000000000000..60c91b641098
--- /dev/null
+++ b/pkgs/development/python-modules/sharedmem/default.nix
@@ -0,0 +1,21 @@
+{ buildPythonPackage, fetchPypi, lib, numpy }:
+
+buildPythonPackage rec {
+
+  pname = "sharedmem";
+  version = "0.3.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1wr438m1jmcj6ccskzm6pchv6ldx7031h040adadjmkivz5rry41";
+  };
+
+  propagatedBuildInputs = [ numpy ];
+
+  meta = {
+    homepage = http://rainwoodman.github.io/sharedmem/;
+    description = "Easier parallel programming on shared memory computers";
+    maintainers = with lib.maintainers; [ edwtjo ];
+    license = lib.licenses.gpl3;
+  };
+}
diff --git a/pkgs/development/python-modules/shellingham/default.nix b/pkgs/development/python-modules/shellingham/default.nix
new file mode 100644
index 000000000000..57cafe2624c5
--- /dev/null
+++ b/pkgs/development/python-modules/shellingham/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, buildPythonPackage, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "shellingham";
+  version = "1.2.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0x1hja3jzvh7xmd0sxnfw9hi3k419s95vb7jjzh76yydzvss1r2q";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Tool to Detect Surrounding Shell";
+    homepage = https://github.com/sarugaku/shellingham;
+    license = licenses.isc;
+    maintainers = with maintainers; [ mbode ];
+  };
+}
diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix
new file mode 100644
index 000000000000..2089142a1deb
--- /dev/null
+++ b/pkgs/development/tools/azcopy/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, buildGoPackage }:
+
+buildGoPackage rec {
+  name = "azure-storage-azcopy-${version}";
+  version = "10.0.1-pre";
+  revision = "10.0.1";
+  goPackagePath = "github.com/Azure/azure-storage-azcopy";
+
+  goDeps= ./deps.nix;
+
+  src = fetchFromGitHub {
+    owner = "Azure";
+    repo = "azure-storage-azcopy";
+    rev = revision;
+    sha256 = "0v1qli01nnx81186q1d2556w457qkbwypq6yy89ns52pqg941arp";
+  };
+
+  meta = with stdenv.lib; {
+    maintainers = with maintainers; [ colemickens ];
+    license = licenses.mit;
+    description = "The new Azure Storage data transfer utility - AzCopy v10";
+  };
+}
diff --git a/pkgs/development/tools/azcopy/deps.nix b/pkgs/development/tools/azcopy/deps.nix
new file mode 100644
index 000000000000..cef400200d06
--- /dev/null
+++ b/pkgs/development/tools/azcopy/deps.nix
@@ -0,0 +1,129 @@
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
+[
+  {
+    goPackagePath  = "github.com/Azure/azure-pipeline-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Azure/azure-pipeline-go";
+      rev =  "7571e8eb0876932ab505918ff7ed5107773e5ee2";
+      sha256 = "0i8n7jna9prq3zdbj0bsr1ha271lgg9233n71dw8li5qsiyg8bs2";
+    };
+  }
+  {
+    goPackagePath  = "github.com/Azure/azure-storage-blob-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Azure/azure-storage-blob-go";
+      rev =  "197d1c0aea1b9eedbbaee0a1a32bf81e879bde80";
+      sha256 = "0wslfah8x1i5l98ss4wxv47ddxfp8mbc90cnfi81v7qnf0bpjp2g";
+    };
+  }
+  {
+    goPackagePath  = "github.com/Azure/azure-storage-file-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Azure/azure-storage-file-go";
+      rev =  "9227fd295d972e4395fd601e6f48cee2f5cda02b";
+      sha256 = "0sr5iqiddjs2lnma5ixrrdik9zciqqd74priivvpycgi3cyxyxyn";
+    };
+  }
+  {
+    goPackagePath  = "github.com/Azure/go-autorest";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Azure/go-autorest";
+      rev =  "39013ecb48eaf6ced3f4e3e1d95515140ce6b3cf";
+      sha256 = "1cbf1ay68lghr4swy2a0asfcjpzkamvz1cqxpdm6691b76j2x6cm";
+    };
+  }
+  {
+    goPackagePath  = "github.com/JeffreyRichter/enum";
+    fetch = {
+      type = "git";
+      url = "https://github.com/JeffreyRichter/enum";
+      rev =  "2567042f9cda26772f0afe08bab6e5105745f298";
+      sha256 = "1d2sjjlp0r2ynk1fb3sb7dgbqzbq4czipb7ffm9zdmjbz0gp6crr";
+    };
+  }
+  {
+    goPackagePath  = "github.com/dgrijalva/jwt-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dgrijalva/jwt-go";
+      rev =  "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e";
+      sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp";
+    };
+  }
+  {
+    goPackagePath  = "github.com/inconshreveable/mousetrap";
+    fetch = {
+      type = "git";
+      url = "https://github.com/inconshreveable/mousetrap";
+      rev =  "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75";
+      sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
+    };
+  }
+  {
+    goPackagePath  = "github.com/jiacfan/keychain";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jiacfan/keychain";
+      rev =  "55285221316b0547171a4258015906e3a4da4721";
+      sha256 = "0nfpmqmj33953awysp1948y6k28cmh4770q0i60jv88k35p10s56";
+    };
+  }
+  {
+    goPackagePath  = "github.com/jiacfan/keyctl";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jiacfan/keyctl";
+      rev =  "988d05162bc59cf7789c35af405be8f1599a87a3";
+      sha256 = "1q4svv9z3s3n2x4ff8cyr53g5ln1yfrcmc3bvznhhwq190dhm94c";
+    };
+  }
+  {
+    goPackagePath  = "github.com/kr/pretty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/pretty";
+      rev =  "73f6ac0b30a98e433b289500d779f50c1a6f0712";
+      sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp";
+    };
+  }
+  {
+    goPackagePath  = "github.com/kr/text";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/text";
+      rev =  "e2ffdb16a802fe2bb95e2e35ff34f0e53aeef34f";
+      sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1";
+    };
+  }
+  {
+    goPackagePath  = "github.com/spf13/cobra";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/cobra";
+      rev =  "ef82de70bb3f60c65fb8eebacbb2d122ef517385";
+      sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd";
+    };
+  }
+  {
+    goPackagePath  = "github.com/spf13/pflag";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/pflag";
+      rev =  "9a97c102cda95a86cec2345a6f09f55a939babf5";
+      sha256 = "005598piihl3l83a71ahj10cpq9pbhjck4xishx1b4dzc02r9xr2";
+    };
+  }
+  {
+    goPackagePath  = "gopkg.in/check.v1";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-check/check";
+      rev =  "788fd78401277ebd861206a03c884797c6ec5541";
+      sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a";
+    };
+  }
+]
\ No newline at end of file
diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix
index cc062eca932e..97cf820f9a94 100644
--- a/pkgs/development/tools/misc/circleci-cli/default.nix
+++ b/pkgs/development/tools/misc/circleci-cli/default.nix
@@ -3,7 +3,7 @@
 let
   owner = "CircleCI-Public";
   pname = "circleci-cli";
-  version = "0.1.2307";
+  version = "0.1.2569";
 in
 buildGoPackage rec {
   name = "${pname}-${version}";
@@ -13,7 +13,7 @@ buildGoPackage rec {
     inherit owner;
     repo = pname;
     rev = "v${version}";
-    sha256 = "0z71jnq42idvhgpgn3mdpbajmgn4b41rpifv5qxn3h1pgi08f75s";
+    sha256 = "0ixiqx8rmia02r44zbhw149p5x9r9cv1fsnlhl8p2x5zd2bdr18x";
   };
 
   goPackagePath = "github.com/${owner}/${pname}";
diff --git a/pkgs/development/tools/profiling/EZTrace/default.nix b/pkgs/development/tools/profiling/EZTrace/default.nix
index 2ff337ef2083..8155f3016c3f 100644
--- a/pkgs/development/tools/profiling/EZTrace/default.nix
+++ b/pkgs/development/tools/profiling/EZTrace/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.6";
+  version = "1.1-7";
   name = "EZTrace-${version}";
 
   src = fetchurl {
-    url = "https://gforge.inria.fr/frs/download.php/file/34082/eztrace-${version}.tar.gz";
-    sha256 = "06q5y9qmdn1h0wjmy28z6gwswskmph49j7simfqcqwv05gvd9svr";
+    url = "https://gforge.inria.fr/frs/download.php/file/37155/eztrace-${version}.tar.gz";
+    sha256 = "0cr2d4fdv4ljvag55dsz3rpha1jan2gc3jhr06ycyk43450pl58p";
   };
 
   # Goes past the rpl_malloc linking failure; fixes silent file breakage
diff --git a/pkgs/development/tools/vagrant/Gemfile b/pkgs/development/tools/vagrant/Gemfile
index f25a77c9398c..d32951f1c054 100644
--- a/pkgs/development/tools/vagrant/Gemfile
+++ b/pkgs/development/tools/vagrant/Gemfile
@@ -1,2 +1,2 @@
 source "https://rubygems.org"
-gem 'vagrant', git: "https://github.com/hashicorp/vagrant.git", tag: "v2.0.4"
+gem 'vagrant'