summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2017-07-26 13:46:04 -0400
committerJohn Ericson <John.Ericson@Obsidian.Systems>2017-07-26 13:46:04 -0400
commit9be40841ea4251a09ae7a1023abc1b6d191f61bb (patch)
treef45a3e2cc682740887b81517eca4bd4fecd6c1c2 /pkgs
parent8ce4780eff33591ed54b2fb97ca96108e4e7a740 (diff)
parentac4c567c3603c5106862f144c21037f6ad76c0ad (diff)
downloadnixpkgs-9be40841ea4251a09ae7a1023abc1b6d191f61bb.tar
nixpkgs-9be40841ea4251a09ae7a1023abc1b6d191f61bb.tar.gz
nixpkgs-9be40841ea4251a09ae7a1023abc1b6d191f61bb.tar.bz2
nixpkgs-9be40841ea4251a09ae7a1023abc1b6d191f61bb.tar.lz
nixpkgs-9be40841ea4251a09ae7a1023abc1b6d191f61bb.tar.xz
nixpkgs-9be40841ea4251a09ae7a1023abc1b6d191f61bb.tar.zst
nixpkgs-9be40841ea4251a09ae7a1023abc1b6d191f61bb.zip
Merge remote-tracking branch 'upstream/master' into staging-base
Conflicts:
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/build-support/gcc-wrapper-old/builder.sh
	pkgs/build-support/trivial-builders.nix
	pkgs/desktops/kde-4.14/kde-package/default.nix
	pkgs/development/compilers/openjdk-darwin/8.nix
	pkgs/development/compilers/openjdk-darwin/default.nix
	pkgs/development/compilers/openjdk/7.nix
	pkgs/development/compilers/openjdk/8.nix
	pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
	pkgs/development/compilers/zulu/default.nix
	pkgs/development/haskell-modules/generic-builder.nix
	pkgs/misc/misc.nix
	pkgs/stdenv/generic/builder.sh
	pkgs/stdenv/generic/setup.sh
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/audio/mpg123/default.nix4
-rw-r--r--pkgs/applications/audio/spotify/default.nix5
-rw-r--r--pkgs/applications/misc/alacritty/default.nix8
-rw-r--r--pkgs/applications/misc/gnss-sdr/default.nix67
-rw-r--r--pkgs/applications/misc/gpsbabel/default.nix20
-rw-r--r--pkgs/applications/networking/cluster/docker-machine/default.nix4
-rw-r--r--pkgs/applications/networking/mumble/default.nix6
-rw-r--r--pkgs/applications/science/logic/cryptominisat/default.nix17
-rw-r--r--pkgs/applications/version-management/gitkraken/default.nix4
-rw-r--r--pkgs/applications/virtualization/virtualbox/default.nix10
-rw-r--r--pkgs/applications/virtualization/virtualbox/guest-additions/default.nix5
-rw-r--r--pkgs/applications/virtualization/virtualbox/linux-4.12.patch80
-rw-r--r--pkgs/applications/window-managers/jwm/default.nix4
-rw-r--r--pkgs/build-support/docker/default.nix5
-rw-r--r--pkgs/build-support/fetchpatch/default.nix9
-rw-r--r--pkgs/build-support/setup-hooks/multiple-outputs.sh2
-rw-r--r--pkgs/development/beam-modules/default.nix4
-rw-r--r--pkgs/development/compilers/ghc/8.0.2.nix2
-rw-r--r--pkgs/development/compilers/ghc/8.2.1.nix8
-rw-r--r--pkgs/development/compilers/ghc/ghc-gold-linker.patch54
-rw-r--r--pkgs/development/compilers/julia/0.5.nix9
-rw-r--r--pkgs/development/compilers/nim/default.nix4
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix23
-rw-r--r--pkgs/development/haskell-modules/configuration-hackage2nix.yaml60
-rw-r--r--pkgs/development/haskell-modules/generic-builder.nix10
-rw-r--r--pkgs/development/haskell-modules/hackage-packages.nix4752
-rw-r--r--pkgs/development/interpreters/elixir/1.5.nix4
-rw-r--r--pkgs/development/libraries/accelio/default.nix64
-rw-r--r--pkgs/development/libraries/accelio/fix-printfs.patch615
-rw-r--r--pkgs/development/libraries/boost/1.64.nix12
-rw-r--r--pkgs/development/libraries/glpk/default.nix4
-rw-r--r--pkgs/development/libraries/gstreamer/libav/default.nix2
-rw-r--r--pkgs/development/libraries/libextractor/default.nix4
-rw-r--r--pkgs/development/libraries/libidn2/default.nix8
-rw-r--r--pkgs/development/libraries/linenoise-ng/default.nix23
-rw-r--r--pkgs/development/libraries/rocksdb/default.nix5
-rw-r--r--pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix4
-rw-r--r--pkgs/development/python-modules/augeas/default.nix33
-rw-r--r--pkgs/development/python-modules/yapf/default.nix4
-rw-r--r--pkgs/development/tools/build-managers/tup/default.nix4
-rw-r--r--pkgs/development/tools/gocode/default.nix13
-rw-r--r--pkgs/development/tools/haskell/haste/haste-Cabal.nix35
-rw-r--r--pkgs/development/tools/haskell/haste/haste-cabal-install.nix46
-rw-r--r--pkgs/development/tools/haskell/haste/haste-compiler.nix33
-rw-r--r--pkgs/development/tools/haskell/multi-ghc-travis/default.nix6
-rw-r--r--pkgs/development/tools/misc/hydra/default.nix6
-rw-r--r--pkgs/development/tools/misc/swig/3.x.nix4
-rw-r--r--pkgs/development/tools/mypy/default.nix20
-rw-r--r--pkgs/games/hedgewars/default.nix2
-rw-r--r--pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix14
-rw-r--r--pkgs/misc/cups/filters.nix4
-rw-r--r--pkgs/misc/emulators/cdemu/analyzer.nix4
-rw-r--r--pkgs/misc/emulators/cdemu/client.nix7
-rw-r--r--pkgs/misc/emulators/cdemu/daemon.nix8
-rw-r--r--pkgs/misc/emulators/cdemu/gui.nix4
-rw-r--r--pkgs/misc/emulators/cdemu/libmirage.nix8
-rw-r--r--pkgs/misc/emulators/cdemu/vhba.nix4
-rw-r--r--pkgs/misc/vim-plugins/default.nix291
-rw-r--r--pkgs/misc/vim-plugins/vim-plugin-names23
-rw-r--r--pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t4
-rw-r--r--pkgs/os-specific/linux/cryptodev/default.nix12
-rw-r--r--pkgs/os-specific/linux/dpdk/default.nix6
-rw-r--r--pkgs/os-specific/linux/kernel/linux-testing.nix6
-rw-r--r--pkgs/os-specific/linux/kernel/perf-binutils-path.patch12
-rw-r--r--pkgs/os-specific/linux/kernel/perf.nix11
-rw-r--r--pkgs/servers/monitoring/lcdproc/default.nix47
-rw-r--r--pkgs/servers/monitoring/lcdproc/hardcode_mtab.patch17
-rw-r--r--pkgs/stdenv/generic/builder.sh1
-rw-r--r--pkgs/tools/X11/setroot/default.nix5
-rw-r--r--pkgs/tools/backup/borg/default.nix4
-rw-r--r--pkgs/tools/backup/znapzend/default.nix4
-rw-r--r--pkgs/tools/compression/zstd/default.nix4
-rw-r--r--pkgs/tools/filesystems/ceph/generic.nix10
-rw-r--r--pkgs/tools/misc/crudini/default.nix24
-rw-r--r--pkgs/tools/misc/dateutils/default.nix4
-rw-r--r--pkgs/tools/misc/ddccontrol/default.nix2
-rw-r--r--pkgs/tools/misc/quota/default.nix24
-rw-r--r--pkgs/tools/misc/xfstests/default.nix17
-rw-r--r--pkgs/tools/misc/xxd/default.nix16
-rw-r--r--pkgs/tools/networking/haproxy/default.nix4
-rw-r--r--pkgs/tools/networking/mailutils/default.nix85
-rw-r--r--pkgs/tools/networking/mailutils/fix-build-mb-len-max.patch14
-rw-r--r--pkgs/tools/networking/mailutils/fix-test-ali-awk.patch16
-rw-r--r--pkgs/tools/networking/mailutils/no-gets.patch14
-rw-r--r--pkgs/tools/networking/mailutils/path-to-cat.patch49
-rw-r--r--pkgs/tools/networking/mailutils/scm_c_string.patch15
-rw-r--r--pkgs/tools/package-management/apt/default.nix65
-rw-r--r--pkgs/tools/package-management/nix-index/default.nix32
-rw-r--r--pkgs/tools/system/honcho/default.nix44
-rw-r--r--pkgs/tools/system/osquery/default.nix79
-rw-r--r--pkgs/tools/system/osquery/misc.patch187
-rw-r--r--pkgs/tools/system/osquery/platform-nixos.patch22
-rw-r--r--pkgs/tools/text/html-tidy/default.nix5
-rw-r--r--pkgs/top-level/all-packages.nix36
-rw-r--r--pkgs/top-level/beam-packages.nix2
-rw-r--r--pkgs/top-level/perl-packages.nix15
-rw-r--r--pkgs/top-level/python-packages.nix68
-rw-r--r--pkgs/top-level/rust-packages.nix6
98 files changed, 5268 insertions, 2214 deletions
diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix
index 59012432caf..37717babce4 100644
--- a/pkgs/applications/audio/mpg123/default.nix
+++ b/pkgs/applications/audio/mpg123/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "mpg123-1.23.8";
+  name = "mpg123-1.25.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/mpg123/${name}.tar.bz2";
-    sha256 = "13ngfzk84k4ks7ymanmq8f6707yrybra5h0mk3ir6mdnxk4068yy";
+    sha256 = "1rxknrnl3ji5hi5rbckpzhbl1k5r8i53kcys4xdgg0xbi8765dfd";
   };
 
   buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 266e221649e..ad0f7ee14c5 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -8,7 +8,8 @@ let
   # Please update the stable branch!
   # Latest version number can be found at:
   # http://repository-origin.spotify.com/pool/non-free/s/spotify-client/
-  version = "1.0.57.474.gca9c9538-30";
+  # Be careful not to pick the testing version.
+  version = "1.0.49.125.g72ee7853-111";
 
   deps = [
     alsaLib
@@ -53,7 +54,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb";
-    sha256 = "fe46f2084c45c756bee366f744d2821d79e82866b19942e30bb2a20c1e597437";
+    sha256 = "0l008x06d257vcw6gq3q90hvv93cq6mxpj11by1np6bzzg61qv8x";
   };
 
   buildInputs = [ dpkg makeWrapper ];
diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index 3dda61d95ae..a00e0ec8a48 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -17,16 +17,16 @@
 with rustPlatform;
 
 buildRustPackage rec {
-  name = "alacritty-unstable-2017-07-08";
+  name = "alacritty-unstable-2017-07-25";
 
   src = fetchFromGitHub {
     owner = "jwilm";
     repo = "alacritty";
-    rev = "94849c4f2a19bd49337f5cf090f94ac6a940c414";
-    sha256 = "0cawrq0787pcfifn5awccq29a1ag85wfbmx1ccz7m33prk3ry9jp";
+    rev = "49c73f6d55e5a681a0e0f836cd3e9fe6af30788f";
+    sha256 = "0h5hrb2g0fpc6xn94hmvxjj21cqbj4vgqkznvd64jl84qbyh1xjl";
   };
 
-  depsSha256 = "0lb83aan6lgdsdcrd6zdrxhz5bi96cw4ygqqlpm43w42chwzz0xj";
+  depsSha256 = "1pbb0swgpsbd6x3avxz6fv3q31dg801li47jibz721a4n9c0rssx";
 
   buildInputs = [
     cmake
diff --git a/pkgs/applications/misc/gnss-sdr/default.nix b/pkgs/applications/misc/gnss-sdr/default.nix
new file mode 100644
index 00000000000..68b49492791
--- /dev/null
+++ b/pkgs/applications/misc/gnss-sdr/default.nix
@@ -0,0 +1,67 @@
+{ stdenv, fetchFromGitHub
+, armadillo
+, boost
+, cmake
+, glog
+, gmock
+, openssl
+, google-gflags
+, gnuradio
+, orc
+, pkgconfig
+, pythonPackages
+, uhd
+}:
+
+stdenv.mkDerivation rec {
+  name = "gnss-sdr-${version}";
+  version = "0.0.9";
+
+  src = fetchFromGitHub {
+    owner = "gnss-sdr";
+    repo = "gnss-sdr";
+    rev = "v${version}";
+    sha256 = "0gis932ly3vk7d5qvznffp54pkmbw3m6v60mxjfdj5dd3r7vf975";
+  };
+
+  buildInputs = [
+    armadillo
+    boost.dev
+    cmake
+    glog
+    gmock
+    openssl.dev
+    google-gflags
+    gnuradio
+    orc
+    pkgconfig
+    pythonPackages.Mako
+
+    # UHD support is optional, but gnuradio is built with it, so there's
+    # nothing to be gained by leaving it out.
+    uhd
+  ];
+
+  enableParallelBuilding = true;
+
+  cmakeFlags = [
+    "-DGFlags_ROOT_DIR=${google-gflags}/lib"
+    "-DGLOG_INCLUDE_DIR=${glog}/include"
+
+    # gnss-sdr doesn't truly depend on BLAS or LAPACK, as long as
+    # armadillo is built using both, so skip checking for them.
+    "-DBLAS=YES"
+    "-DLAPACK=YES"
+
+    # Similarly, it doesn't actually use gfortran despite checking for
+    # its presence.
+    "-DGFORTRAN=YES"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "An open source Global Navigation Satellite Systems software-defined receiver";
+    homepage = http://gnss-sdr.org/;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix
index ace89cd8a21..0911fbace44 100644
--- a/pkgs/applications/misc/gpsbabel/default.nix
+++ b/pkgs/applications/misc/gpsbabel/default.nix
@@ -1,14 +1,14 @@
-{ lib, stdenv, fetchurl, fetchpatch, zlib, qt4, which, IOKit }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, zlib, which, IOKit, qtbase }:
 
 stdenv.mkDerivation rec {
   name = "gpsbabel-${version}";
-  version = "1.5.3";
+  version = "1.5.4";
 
-  src = fetchurl {
-    # gpgbabel.org makes it hard to get the source tarball automatically, so
-    # get it from elsewhere.
-    url = "mirror://debian/pool/main/g/gpsbabel/gpsbabel_${version}.orig.tar.gz";
-    sha256 = "0l6c8911f7i5bbdzah9irhqf127ib0b7lv53rb8r9z8g439mznq1";
+  src = fetchFromGitHub {
+    owner = "gpsbabel";
+    repo = "gpsbabel";
+    rev = "gpsbabel_${lib.replaceStrings ["."] ["_"] version}";
+    sha256 = "0v6wpp14zkfbarmksf9dn3wmpj1araxd7xi5xp7gpl7kafb9aiwi";
   };
 
   patches = [
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  buildInputs = [ zlib qt4 which ]
+  buildInputs = [ zlib qtbase which ]
     ++ lib.optionals stdenv.isDarwin [ IOKit ];
 
   /* FIXME: Building the documentation, with "make doc", requires this:
@@ -46,7 +46,9 @@ stdenv.mkDerivation rec {
     # The raymarine and gtm tests fail on i686 despite -ffloat-store.
   + lib.optionalString stdenv.isi686 "rm -v testo.d/raymarine.test testo.d/gtm.test;"
     # The gtm, kml and tomtom asc tests fail on darwin, see PR #23572.
-  + lib.optionalString stdenv.isDarwin "rm -v testo.d/gtm.test testo.d/kml.test testo.d/tomtom_asc.test";
+  + lib.optionalString stdenv.isDarwin "rm -v testo.d/gtm.test testo.d/kml.test testo.d/tomtom_asc.test testo.d/classic-2.test"
+    # The arc-project test fails on aarch64.
+  + lib.optionalString stdenv.isAarch64 "rm -v testo.d/arc-project.test";
 
   meta = with stdenv.lib; {
     description = "Convert, upload and download data from GPS and Map programs";
diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix
index b2d70b1f767..5016dc8fca3 100644
--- a/pkgs/applications/networking/cluster/docker-machine/default.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/default.nix
@@ -3,7 +3,7 @@
 
 buildGoPackage rec {
   name = "machine-${version}";
-  version = "0.10.0";
+  version = "0.12.0";
 
   goPackagePath = "github.com/docker/machine";
 
@@ -11,7 +11,7 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "docker";
     repo = "machine";
-    sha256 = "1ik0jbp8zqzmg8w1fnf82gdlwrvw4nl40lmins7h8y0q6psrp6gc";
+    sha256 = "08y87d0whag9sy1q5s84xrz95k12c9crh3zmdcr1ylrwqnszrn2y";
   };
 
   postInstall = ''
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 696681dce27..1b87008bac7 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -119,14 +119,14 @@ let
   };
 
   gitSource = rec {
-    version = "2017-04-16";
+    version = "2017-05-25";
     qtVersion = 5;
 
     # Needs submodules
     src = fetchgit {
       url = "https://github.com/mumble-voip/mumble";
-      rev = "eb63d0b14a7bc19bfdf34f80921798f0a67cdedf";
-      sha256 = "1nirbx0fnvi1nl6s5hrm4b0v7s2i22yshkmqnfjhxyr0y272s7lh";
+      rev = "3754898ac94ed3f1e86408114917d1b4c06f17b3";
+      sha256 = "1qh49x3y7m0c0h0gcs6amkf8nb75p6g611zwn19mbplwmi7h9y8f";
     };
   };
 in {
diff --git a/pkgs/applications/science/logic/cryptominisat/default.nix b/pkgs/applications/science/logic/cryptominisat/default.nix
index 26efbc5fe72..4d96339149a 100644
--- a/pkgs/applications/science/logic/cryptominisat/default.nix
+++ b/pkgs/applications/science/logic/cryptominisat/default.nix
@@ -1,18 +1,17 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake, python, vim }:
+{ stdenv, fetchFromGitHub, fetchpatch, cmake, python, xxd }:
 
 stdenv.mkDerivation rec {
   name = "cryptominisat-${version}";
   version = "5.0.1";
 
   src = fetchFromGitHub {
-    owner = "msoos";
-    repo = "cryptominisat";
-    rev = version;
+    owner  = "msoos";
+    repo   = "cryptominisat";
+    rev    = version;
     sha256 = "0cpw5d9vplxvv3aaplhnga55gz1hy29p7s4pkw1306knkbhlzvkb";
   };
 
-  # vim for xxd binary
-  buildInputs = [ python vim ];
+  buildInputs = [ python xxd ];
   nativeBuildInputs = [ cmake ];
 
   patches = [(fetchpatch rec {
@@ -23,9 +22,9 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An advanced SAT Solver";
+    homepage    = https://github.com/msoos/cryptominisat;
+    license     = licenses.mit;
     maintainers = with maintainers; [ mic92 ];
-    platforms = platforms.unix;
-    license = licenses.mit;
-    homepage = https://github.com/msoos/cryptominisat;
+    platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index 23a3ab7fa5e..c7f7a4b02e4 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -9,11 +9,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "gitkraken-${version}";
-  version = "2.6.0";
+  version = "2.7.0";
 
   src = fetchurl {
     url = "https://release.gitkraken.com/linux/v${version}.deb";
-    sha256 = "1msdwqp20pwaxv1a6maqb7wmaq00m8jpdga7fmbjcnpvkcdz49l7";
+    sha256 = "0088vdn47563f0v9zhk1vggn3c2cfg8rhmifc6nw4zbss49si5gp";
   };
 
   libPath = makeLibraryPath [
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 6675068bda9..a67663d56df 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -18,10 +18,10 @@ with stdenv.lib;
 let
   python = python2;
   buildType = "release";
-  extpack = "244e6f450cba64e0b025711050db3c43e6ce77e12cd80bcd08796315a90c8aaf";
-  extpackRev = "115126";
-  main = "fcc918000b8c5ece553541ec10a9182410a742b7266257c76dda895dcd389899";
-  version = "5.1.22";
+  extpack = "1952ikz4xsjgdd0pzdx1riwaingyhkxp0ind31yzqc4d0hp8l6b5";
+  extpackRev = "117012";
+  main = "0q5vjsih4ndn1b0s9l1ppxng6dljld5bin5nqfrhvgr2ldlv2bgf";
+  version = "5.1.24";
 
   # See https://github.com/NixOS/nixpkgs/issues/672 for details
   extensionPack = requireFile rec {
@@ -88,7 +88,7 @@ in stdenv.mkDerivation {
   '';
 
   patches = optional enableHardening ./hardened.patch
-    ++ [ ./qtx11extras.patch ./linux-4.12.patch ];
+    ++ [ ./qtx11extras.patch ];
 
   postPatch = ''
     sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 8865022c23e..e19cb748607 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "54df14f234b6aa484b94939ab0f435b5dd859417612b65a399ecc34a62060380";
+    sha256 = "0hxxv2707fb6x34m5cmjhj73sxwgmy2dgir7mbbdh9wivw07b9q1";
   };
 
   KERN_DIR = "${kernel.dev}/lib/modules/*/build";
@@ -62,9 +62,6 @@ stdenv.mkDerivation {
     for i in *
     do
         cd $i
-        # Files within the guest additions ISO are using DOS line endings
-        sed -re '/^(@@|---|\+\+\+)/!s/$/\r/' ${../linux-4.12.patch} \
-          | patch -d vboxguest -p4
         find . -type f | xargs sed 's/depmod -a/true/' -i
         make
         cd ..
diff --git a/pkgs/applications/virtualization/virtualbox/linux-4.12.patch b/pkgs/applications/virtualization/virtualbox/linux-4.12.patch
deleted file mode 100644
index 7157365466f..00000000000
--- a/pkgs/applications/virtualization/virtualbox/linux-4.12.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-commit 47fee9325e3b5feed0dbc4ba9e2de77c6d55e3bb
-Author: vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f>
-Date:   Wed May 17 09:42:23 2017 +0000
-
-    Runtime/r0drv: Linux 4.12 5-level page table adaptions
-    
-    
-    git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@66927 cfe28804-0f27-0410-a406-dd0f0b0b656f
-
-diff --git a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
-index 28dc33f963..41ed058860 100644
---- a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
-+++ b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
-@@ -902,6 +902,9 @@ static struct page *rtR0MemObjLinuxVirtToPage(void *pv)
-     union
-     {
-         pgd_t       Global;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
-+        p4d_t       Four;
-+#endif
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)
-         pud_t       Upper;
- #endif
-@@ -917,12 +920,26 @@ static struct page *rtR0MemObjLinuxVirtToPage(void *pv)
-     u.Global = *pgd_offset(current->active_mm, ulAddr);
-     if (RT_UNLIKELY(pgd_none(u.Global)))
-         return NULL;
--
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
-+    u.Four  = *p4d_offset(&u.Global, ulAddr);
-+    if (RT_UNLIKELY(p4d_none(u.Four)))
-+        return NULL;
-+    if (p4d_large(u.Four))
-+    {
-+        pPage = p4d_page(u.Four);
-+        AssertReturn(pPage, NULL);
-+        pfn   = page_to_pfn(pPage);      /* doing the safe way... */
-+        AssertCompile(P4D_SHIFT - PAGE_SHIFT < 31);
-+        pfn  += (ulAddr >> PAGE_SHIFT) & ((UINT32_C(1) << (P4D_SHIFT - PAGE_SHIFT)) - 1);
-+        return pfn_to_page(pfn);
-+    }
-+    u.Upper = *pud_offset(&u.Four, ulAddr);
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)
-     u.Upper = *pud_offset(&u.Global, ulAddr);
-+#endif
-     if (RT_UNLIKELY(pud_none(u.Upper)))
-         return NULL;
--# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
-     if (pud_large(u.Upper))
-     {
-         pPage = pud_page(u.Upper);
-@@ -931,8 +948,8 @@ static struct page *rtR0MemObjLinuxVirtToPage(void *pv)
-         pfn += (ulAddr >> PAGE_SHIFT) & ((UINT32_C(1) << (PUD_SHIFT - PAGE_SHIFT)) - 1);
-         return pfn_to_page(pfn);
-     }
--# endif
--
-+#endif
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)
-     u.Middle = *pmd_offset(&u.Upper, ulAddr);
- #else  /* < 2.6.11 */
-     u.Middle = *pmd_offset(&u.Global, ulAddr);
-diff --git a/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h b/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
-index 5afdee9e71..20aab0817f 100644
---- a/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
-+++ b/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
-@@ -159,6 +159,11 @@
- # include <asm/tlbflush.h>
- #endif
- 
-+/* for set_pages_x() */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
-+# include <asm/set_memory.h>
-+#endif
-+
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0)
- # include <asm/smap.h>
- #else
diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix
index 40050a69025..85136cb9f97 100644
--- a/pkgs/applications/window-managers/jwm/default.nix
+++ b/pkgs/applications/window-managers/jwm/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "jwm-${version}";
-  version = "1594";
+  version = "1600";
   
   src = fetchFromGitHub {
     owner = "joewing";
     repo = "jwm";
     rev = "s${version}";
-    sha256 = "1608ws3867xipcbdl2gw6ybcxzk14vq24sr62m9l65m4g4m3wbd2";
+    sha256 = "0rfb67r6g873alvcbn9531415qlfmvfrdfm4xrsyhdgdwj7dv5kv";
   };
 
   nativeBuildInputs = [ pkgconfig automake autoconf libtool gettext which ];
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 506ef7837a2..0d02897da74 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -409,8 +409,9 @@ rec {
         };
       result = runCommand "docker-image-${baseName}.tar.gz" {
         buildInputs = [ jshon pigz coreutils findutils ];
-        imageName = name;
-        imageTag = tag;
+        # Image name and tag must be lowercase
+        imageName = lib.toLower name;
+        imageTag = lib.toLower tag;
         inherit fromImage baseJson;
         layerClosure = writeReferencesToFile layer;
         passthru.buildArgs = args;
diff --git a/pkgs/build-support/fetchpatch/default.nix b/pkgs/build-support/fetchpatch/default.nix
index a6ddf132cd5..a9bfac320fb 100644
--- a/pkgs/build-support/fetchpatch/default.nix
+++ b/pkgs/build-support/fetchpatch/default.nix
@@ -5,7 +5,7 @@
 # stripLen acts as the -p parameter when applying a patch.
 
 { lib, fetchurl, patchutils }:
-{ stripLen ? 0, addPrefixes ? false, ... }@args:
+{ stripLen ? 0, addPrefixes ? false, excludes ? [], ... }@args:
 
 fetchurl ({
   postFetch = ''
@@ -21,7 +21,10 @@ fetchurl ({
            --addnewprefix=b/ \
         ''} \
         --clean "$out" > "$tmpfile"
-    mv "$tmpfile" "$out"
+    ${patchutils}/bin/filterdiff \
+      -p1 \
+      ${builtins.toString (builtins.map (x: "-x ${x}") excludes)} \
+      "$tmpfile" > "$out"
     ${args.postFetch or ""}
   '';
-} // builtins.removeAttrs args ["stripLen" "addPrefixes"])
+} // builtins.removeAttrs args ["stripLen" "addPrefixes" "excludes"])
diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh
index 9abf50f6ea4..62a6491b8dc 100644
--- a/pkgs/build-support/setup-hooks/multiple-outputs.sh
+++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh
@@ -202,7 +202,7 @@ _multioutPropagateDev() {
 
     mkdir -p "${!propagaterOutput}"/nix-support
     for output in $propagatedBuildOutputs; do
-        echo "${!output}" >> "${!propagaterOutput}"/nix-support/$propagatedBuildInputsFile
+        echo -n " ${!output}" >> "${!propagaterOutput}"/nix-support/$propagatedBuildInputsFile
     done
 }
 
diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index fa748da0031..3a165fd2f6a 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -37,9 +37,9 @@ let
         buildMix = callPackage ./build-mix.nix {};
 
         # BEAM-based languages.
-        elixir = elixir_1_4;
+        elixir = elixir_1_5;
 
-        elixir_1_5_rc = lib.callElixir ../interpreters/elixir/1.5.nix {
+        elixir_1_5 = lib.callElixir ../interpreters/elixir/1.5.nix {
                        inherit rebar erlang;
                        debugInfo = true;
                      };
diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix
index cc0b1d4eadd..7df72be2c81 100644
--- a/pkgs/development/compilers/ghc/8.0.2.nix
+++ b/pkgs/development/compilers/ghc/8.0.2.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     sha256 = "1c8qc4fhkycynk4g1f9hvk53dj6a1vvqi6bklqznns6hw59m8qhi";
   };
 
-  patches = []
+  patches = [ ./ghc-gold-linker.patch ]
     ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch
     ++ stdenv.lib.optional stdenv.isDarwin ./ghc-8.0.2-no-cpp-warnings.patch;
 
diff --git a/pkgs/development/compilers/ghc/8.2.1.nix b/pkgs/development/compilers/ghc/8.2.1.nix
index 92014200c61..a046cd0b67d 100644
--- a/pkgs/development/compilers/ghc/8.2.1.nix
+++ b/pkgs/development/compilers/ghc/8.2.1.nix
@@ -9,8 +9,8 @@
 
 let
   inherit (bootPkgs) ghc;
-  version = "8.2.1-rc3";
-  preReleaseName = "ghc-8.2.0.20170704";
+  version = "8.2.1";
+  preReleaseName = "ghc-8.2.1";
   commonBuildInputs = [ alex autoconf automake ghc happy hscolour perl python3 sphinx ];
   commonPreConfigure =  ''
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
@@ -27,11 +27,13 @@ in stdenv.mkDerivation (rec {
 
   src = fetchurl {
     url = "https://downloads.haskell.org/~ghc/${version}/${preReleaseName}-src.tar.xz";
-    sha256 = "0ccfybbjrmd8yzqbfdqvb6clz2kd005wi8sx3mfjmbkmxv0l4jry";
+    sha256 = "1w4k0n23b9fg8kmarqhfamzpmf91p6jcdr6xlwzfmb4df2bd9hng";
   };
 
   postPatch = "patchShebangs .";
 
+  patches = [ ./ghc-gold-linker.patch ];
+
   preConfigure = commonPreConfigure;
 
   buildInputs = commonBuildInputs;
diff --git a/pkgs/development/compilers/ghc/ghc-gold-linker.patch b/pkgs/development/compilers/ghc/ghc-gold-linker.patch
new file mode 100644
index 00000000000..edce7ef3a17
--- /dev/null
+++ b/pkgs/development/compilers/ghc/ghc-gold-linker.patch
@@ -0,0 +1,54 @@
+From 46fe80ab7c0013a929d0934e61429820042a70a9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
+Date: Fri, 21 Jul 2017 20:09:11 +0200
+Subject: [PATCH 1/2] base: Add `extra-libraries: m` because base uses libm
+ functions.
+
+Linking with gold needs this because in contrast to ld, gold
+doesn't implicitly link libm.
+
+Found by Michael Bishop <cleverca22@gmail.com>.
+---
+ libraries/base/base.cabal | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/libraries/base/base.cabal b/libraries/base/base.cabal
+index f00fb8768e5..fd91f268ffe 100644
+--- a/libraries/base/base.cabal
++++ b/libraries/base/base.cabal
+@@ -342,6 +342,10 @@ Library
+         WCsubst.h
+         consUtils.h
+ 
++    -- Base uses libm functions. ld.bfd links libm implicitly when necessary.
++    -- Other linkers, like gold, don't, so we have to declare it explicitly.
++    extra-libraries: m
++
+     -- OS Specific
+     if os(windows)
+         -- Windows requires some extra libraries for linking because the RTS
+
+From 900a8f4931e9bc6d3219d9263cfecfc6af8fc766 Mon Sep 17 00:00:00 2001
+From: michael bishop <cleverca22@gmail.com>
+Date: Sat, 22 Jul 2017 13:12:39 -0300
+Subject: [PATCH 2/2] also add -lm to ghc-prim
+
+---
+ libraries/ghc-prim/ghc-prim.cabal | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/libraries/ghc-prim/ghc-prim.cabal b/libraries/ghc-prim/ghc-prim.cabal
+index 00a029efedf..6db85dd69fc 100644
+--- a/libraries/ghc-prim/ghc-prim.cabal
++++ b/libraries/ghc-prim/ghc-prim.cabal
+@@ -42,6 +42,10 @@ Library
+         UnliftedFFITypes
+ 
+     build-depends: rts == 1.0.*
++    
++    -- Base uses libm functions. ld.bfd links libm implicitly when necessary.
++    -- Other linkers, like gold, don't, so we have to declare it explicitly.
++    extra-libraries: m
+ 
+     exposed-modules:
+         GHC.CString
diff --git a/pkgs/development/compilers/julia/0.5.nix b/pkgs/development/compilers/julia/0.5.nix
index 6e379091703..cfe3d59aba3 100644
--- a/pkgs/development/compilers/julia/0.5.nix
+++ b/pkgs/development/compilers/julia/0.5.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, fetchurl
+{ stdenv, fetchgit, fetchurl, fetchzip
 # build tools
 , gfortran, m4, makeWrapper, patchelf, perl, which, python2
 , runCommand
@@ -54,12 +54,12 @@ in
 
 stdenv.mkDerivation rec {
   pname = "julia";
-  version = "0.5.1";
+  version = "0.5.2";
   name = "${pname}-${version}";
 
-  src = fetchurl {
+  src = fetchzip {
     url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "1a9m7hzzrwk71gvwwrd1p45s64yid61i41n95gm5pzbry6p9fpl0";
+    sha256 = "1616f53dj7xc0g2iys8qfbzal6dx55nswnws5g5r44dlbf4hcl0h";
   };
   prePatch = ''
     mkdir deps/srccache
@@ -166,6 +166,7 @@ stdenv.mkDerivation rec {
   preBuild = ''
     sed -e '/^install:/s@[^ ]*/doc/[^ ]*@@' -i Makefile
     sed -e '/[$](DESTDIR)[$](docdir)/d' -i Makefile
+    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
   '';
 
   postInstall = ''
diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix
index 0cebd40afdb..101f8ab64ba 100644
--- a/pkgs/development/compilers/nim/default.nix
+++ b/pkgs/development/compilers/nim/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "nim-${version}";
-  version = "0.16.0";
+  version = "0.17.0";
 
   src = fetchurl {
     url = "http://nim-lang.org/download/${name}.tar.xz";
-    sha256 = "0rsibhkc5n548bn9yyb9ycrdgaph5kq84sfxc9gabjs7pqirh6cy";
+    sha256 = "16vsmk4rqnkg9lc9h9jk62ps0x778cdqg6qrs3k6fv2g73cqvq9n";
   };
 
   doCheck = true;
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 8fa2cbcf713..3a3928f5618 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -15,10 +15,17 @@ with import ./lib.nix { inherit pkgs; };
 
 self: super: {
 
+  # This used to be a core package provided by GHC, but then the compiler
+  # dropped it. We define the name here to make sure that old packages which
+  # depend on this library still evaluate (even though they won't compile
+  # successfully with recent versions of the compiler).
+  bin-package-db = null;
+
   # Some Hackage packages reference this attribute, which exists only in the
   # GHCJS package set. We provide a dummy version here to fix potential
   # evaluation errors.
   ghcjs-base = null;
+  ghcjs-prim = null;
 
   # Some packages need a non-core version of Cabal.
   cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_1_24_2_0; });
@@ -664,11 +671,6 @@ self: super: {
   # We get lots of strange compiler errors during the test suite run.
   jsaddle = dontCheck super.jsaddle;
 
-  # Haste stuff
-  haste-Cabal         = markBroken (self.callPackage ../tools/haskell/haste/haste-Cabal.nix {});
-  haste-cabal-install = markBroken (self.callPackage ../tools/haskell/haste/haste-cabal-install.nix { Cabal = self.haste-Cabal; });
-  haste-compiler      = markBroken (self.callPackage ../tools/haskell/haste/haste-compiler.nix { inherit overrideCabal; super-haste-compiler = super.haste-compiler; });
-
   # tinc is a new build driver a la Stack that's not yet available from Hackage.
   tinc = self.callPackage ../tools/haskell/tinc { inherit (pkgs) cabal-install cabal2nix; };
 
@@ -680,14 +682,6 @@ self: super: {
     then appendConfigureFlag super.gtk "-fhave-quartz-gtk"
     else super.gtk;
 
-  # The stack people don't bother making their own code compile in an LTS-based
-  # environment: https://github.com/commercialhaskell/stack/issues/3001.
-  stack = super.stack.overrideScope (self: super: {
-    store-core = self.store-core_0_3;
-    store = self.store_0_3_1;
-    hpack = self.hpack_0_17_1;
-  });
-
   # It makes no sense to have intero-nix-shim in Hackage, so we publish it here only.
   intero-nix-shim = self.callPackage ../tools/haskell/intero-nix-shim {};
 
@@ -877,4 +871,7 @@ self: super: {
   # Has a dependency on outdated versions of directory.
   cautious-file = doJailbreak (dontCheck super.cautious-file);
 
+  # https://github.com/diagrams/diagrams-solve/issues/4
+  diagrams-solve = dontCheck super.diagrams-solve;
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 204a23c6286..78f123af0fe 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2446,6 +2446,7 @@ extra-packages:
   - binary > 0.8 && < 0.9               # keep a 8.x major release around for older compilers
   - Cabal == 1.18.*                     # required for cabal-install et al on old GHC versions
   - Cabal == 1.20.*                     # required for cabal-install et al on old GHC versions
+  - Cabal == 1.24.*                     # required for jailbreak-cabal etc.
   - containers < 0.5                    # required to build alex with GHC 6.12.3
   - control-monad-free < 0.6            # newer versions don't compile with anything but GHC 7.8.x
   - deepseq == 1.3.0.1                  # required to build Cabal with GHC 6.12.3
@@ -2456,7 +2457,6 @@ extra-packages:
   - haddock-api == 2.16.*               # required on GHC 7.10.x
   - haddock-library == 1.2.*            # required for haddock-api-2.16.x
   - haskell-src-exts == 1.18.*          # required by hoogle-5.0.4
-  - hpack < 0.18                        # required by stack-1.4.0
   - mtl < 2.2                           # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x
   - mtl-prelude < 2                     # required for to build postgrest on mtl 2.1.x platforms
   - network == 2.6.3.1                  # newer versions don't compile with GHC 7.4.x and below
@@ -2466,12 +2466,9 @@ extra-packages:
   - seqid < 0.2                         # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
   - seqid-streams < 0.2                 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
   - split < 0.2                         # newer versions don't work with GHC 6.12.3
-  - store < 0.4                         # needed by stack 1.4.0
-  - store-core < 0.4                    # needed by stack 1.4.0
   - tar < 0.4.2.0                       # later versions don't work with GHC < 7.6.x
   - transformers == 0.4.3.*             # the latest version isn't supported by mtl yet
   - vector < 0.10.10                    # newer versions don't work with GHC 6.12.3
-  - zlib < 0.6                          # newer versions break cabal-install
 
 package-maintainers:
   peti:
@@ -2704,6 +2701,7 @@ dont-distribute-packages:
   alex-meta:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   alfred:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   alga:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  algebraic-classes:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   algebraic:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   algebra-sql:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   AlgorithmW:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3056,6 +3054,7 @@ dont-distribute-packages:
   bits-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bitset:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   bitspeak:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bit-stream:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   bitstream:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   bittorrent:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   bit-vector:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3096,6 +3095,7 @@ dont-distribute-packages:
   bluetileutils:                                [ 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 ]
+  bno055-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   board-games:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   bogre-banana:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bond-haskell-compiler:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3297,6 +3297,7 @@ dont-distribute-packages:
   chatty:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   chatty-text:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   chatty-utils:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  chatwork:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   cheapskate-terminal:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   checked:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Checked:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3411,6 +3412,7 @@ dont-distribute-packages:
   Codec-Image-DevIL:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   codec-libevent:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   codecov-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  codec-rpm:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   codemonitor:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   codepad:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   codeworld-api:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3451,7 +3453,9 @@ dont-distribute-packages:
   comonad-random:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   ComonadSheet:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   compactable:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  compact:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   compact-map:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  compact-mutable:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   compact-socket:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   compact-string:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   compdata-automata:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3479,6 +3483,7 @@ dont-distribute-packages:
   concraft-hr:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   concraft:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   concraft-pl:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  concrete-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 ]
   Concurrential:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3542,6 +3547,7 @@ dont-distribute-packages:
   copilot:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   copilot-language:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   copilot-libraries:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  copilot-sbv:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   copilot-theorem:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   copr:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   COrdering:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3600,12 +3606,14 @@ dont-distribute-packages:
   criterion-to-html:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   criu-rpc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   criu-rpc-types:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  crjdt-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   crocodile:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cron-compat:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   cruncher-types:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   crunghc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   crypto-cipher-benchmarks:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   crypto-classical:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cryptoconditions:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   crypto-conduit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   crypto-enigma:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   crypto-multihash:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3752,6 +3760,7 @@ dont-distribute-packages:
   debug-me:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   decepticons:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   decimal-arithmetic:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  decimal-literals:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   DecisionTree:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   decoder-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   dedukti:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3837,6 +3846,7 @@ dont-distribute-packages:
   digitalocean-kzs:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   dimensional-codata:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   DimensionalHash:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dimensions:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   dingo-core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   dingo-example:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   dingo-widgets:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3938,6 +3948,7 @@ dont-distribute-packages:
   dtd:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dtd-text:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   dtd-types:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dumb-cas:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   duplo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Dust-crypto:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Dust:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3967,6 +3978,7 @@ dont-distribute-packages:
   easyplot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   easyrender:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   easytensor:                                   [ i686-linux ]
+  easytensor:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ebeats:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ebnf-bff:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ec2-unikernel:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3999,6 +4011,7 @@ dont-distribute-packages:
   ekg-rrd:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   electrum-mnemonic:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   elevator:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  eliminators:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   elision:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   elocrypt:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   elsa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4194,6 +4207,7 @@ dont-distribute-packages:
   fishfood:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   fit:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   fitsio:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fitspec:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   fixed-point:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   fixed-point-vector:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   fixed-point-vector-space:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4405,6 +4419,7 @@ dont-distribute-packages:
   getflag:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   GGg:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ggtsTC:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghc-compact:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-dump-tree:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-dup:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-events-analyze:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4563,12 +4578,14 @@ dont-distribute-packages:
   GoogleDirections:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-drive:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-html5-slide:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  google-maps-geocoding:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-oauth2-for-cli:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-oauth2:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-oauth2-jwt:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   googleplus:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   googlepolyline:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   GoogleSB:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  google-static-maps:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   GoogleSuggest:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-translate:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   GoogleTranslate:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4684,6 +4701,7 @@ dont-distribute-packages:
   gulcii:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gyah-bin:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   h2048:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  h2c:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   haar:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   habit:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hablog:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4722,6 +4740,7 @@ dont-distribute-packages:
   hack-middleware-jsonp:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hactor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hactors:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haddock:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   haddock-leksah:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   haddocset:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hadoop-formats:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4883,6 +4902,7 @@ dont-distribute-packages:
   haskell-import-graph:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-kubernetes:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaskellLM:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-lsp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-mpfr:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-names:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-neo4j-client:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5003,6 +5023,7 @@ dont-distribute-packages:
   HCL:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hcltest:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hcoap:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hcom:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hcoord:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hcron:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hCsound:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5190,6 +5211,7 @@ dont-distribute-packages:
   HLearn-distributions:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hledger-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hledger-chart:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hledger-iadd:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hledger-irr:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hledger-vty:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlibBladeRF:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5660,6 +5682,8 @@ dont-distribute-packages:
   incremental-computing:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   incremental-maps:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   increments:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  indentation:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  indentation-trifecta:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   indexed-extras:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   IndexedList:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   indices:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5974,6 +5998,7 @@ dont-distribute-packages:
   language-lua2:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-lua-qq:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-mixal:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  language-ninja:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-objc:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-pig:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-puppet:                              [ i686-linux, x86_64-darwin ]
@@ -6421,6 +6446,7 @@ dont-distribute-packages:
   monad-classes:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-classes-logging:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   MonadCompose:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monad-dijkstra:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-exception:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-fork:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   monadiccp-gecode:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6674,6 +6700,7 @@ dont-distribute-packages:
   n-m:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   nm:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   nntp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  noether:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   nofib-analyze:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   noise:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   nomyx-api:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6709,6 +6736,7 @@ dont-distribute-packages:
   NumberTheory:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   numerals-base:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   numerals:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  numeric-ode:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   numeric-ranges:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   numhask:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   numhask-range:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6751,6 +6779,7 @@ dont-distribute-packages:
   onama:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   one-liner:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   oneormore:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  online:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   OnRmt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   onu-course:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   opaleye-classy:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6890,6 +6919,7 @@ dont-distribute-packages:
   PCLT-DB:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   PCLT:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   pcre-light-extra:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pdfname:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   pdf-slave:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   pdf-slave-template:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   pdfsplit:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6904,12 +6934,14 @@ dont-distribute-packages:
   penny-bin:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   penny:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   penny-lib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  penrose:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   peparser:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   perceptron:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   perdure:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   peregrin:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   perfecthash:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   PerfectHash:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  perf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   period:                                       [ 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 ]
@@ -6937,6 +6969,7 @@ dont-distribute-packages:
   pgdl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   pg-harness:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pg-harness-server:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pg-recorder:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pgsql-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pg-store:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pgstream:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6996,6 +7029,7 @@ dont-distribute-packages:
   plailude:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   planar-graph:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   plat:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  platinum-parsing:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   PlayingCards:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   playlists:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   plist-buddy:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7018,6 +7052,7 @@ dont-distribute-packages:
   pointless-rewrite:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   point-octree:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pokemon-go-protobuf-types:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  poker-eval:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pokitdok:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   polar-configfile:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   polar-shader:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7122,6 +7157,7 @@ dont-distribute-packages:
   progression:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   progressive:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   proj4-hs-bindings:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  project-m36:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   prolog-graph:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   prolog-graph-lib:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   prolog:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7430,6 +7466,7 @@ dont-distribute-packages:
   req:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   request-monad:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   rerebase:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  resin:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   resistor-cube:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   resource-effect:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   resource-embed:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7771,6 +7808,7 @@ dont-distribute-packages:
   simpleirc:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   simpleirc-lens:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-logger:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simple-logging:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   SimpleLog:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-log-syslog:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-neural-networks:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7977,6 +8015,7 @@ dont-distribute-packages:
   ssh:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   sssp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   sstable:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SSTG:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   stable-heap:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   stable-maps:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   stable-marriage:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7987,6 +8026,7 @@ dont-distribute-packages:
   stackage-curator:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage-setup:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stack-bump:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   stack-hpc-coveralls:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   stack-prism:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   standalone-derive-topdown:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8036,6 +8076,7 @@ dont-distribute-packages:
   streamed:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   stream-fusion:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   stream:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  streaming-cassava:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-eversion:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-utils:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   stream-monad:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8125,6 +8166,7 @@ dont-distribute-packages:
   system-canonicalpath:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   system-info:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   system-lifted:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  system-linux-proc:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   system-locale:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   system-random-effect:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   systemstats:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8215,6 +8257,7 @@ dont-distribute-packages:
   terntup:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   terrahs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tersmu:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  testbench:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   TestExplode:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-framework-doctest:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-framework-quickcheck:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8234,6 +8277,7 @@ dont-distribute-packages:
   test-shouldbe:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-simple:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   tex2txt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  TeX-my-math:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   texrunner:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-all:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-and-plots:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8278,6 +8322,7 @@ dont-distribute-packages:
   th-kinds-fork:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   th-kinds:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   thorn:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  threadscope:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   threads-extras:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   threepenny-gui-contextmenu:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   threepenny-gui-flexbox:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8426,6 +8471,7 @@ dont-distribute-packages:
   turing-machines:                              [ 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 ]
   twentefp-graphs:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8543,6 +8589,7 @@ dont-distribute-packages:
   url-generic:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   URLT:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   urn:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  urn-random:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   urxml:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   usb-enumerator:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   usb-hid:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8657,6 +8704,7 @@ dont-distribute-packages:
   wai-middleware-route:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-static-caching:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-static:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-middleware-verbs:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-responsible:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-router:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-routes:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8758,6 +8806,7 @@ dont-distribute-packages:
   WordNet-ghc74:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   WordNet:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   wordsearch:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  word-wrap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   workdays:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   workflow-osx:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   workflow-pure:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8794,6 +8843,7 @@ dont-distribute-packages:
   X11-xdamage:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   X11-xfixes:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   x11-xinput:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  x509-util:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   x86-64bit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   xcffib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   xchat-plugin:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8873,6 +8923,7 @@ dont-distribute-packages:
   yampa2048:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   yampa-canvas:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   yampa-glfw:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yampa-glut:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Yampa:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   YampaSynth:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yaop:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8896,6 +8947,7 @@ dont-distribute-packages:
   yesod-auth-kerberos:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-ldap:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-ldap-mediocre:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-auth-ldap-native:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-oauth2:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-oauth:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-pam:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 2ec77b0563a..831d512f034 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -144,9 +144,9 @@ let
   allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++
                         optionals doCheck testPkgconfigDepends ++ optionals withBenchmarkDepends benchmarkPkgconfigDepends;
 
-  nativeBuildInputs = setupHaskellDepends ++ buildTools ++ libraryToolDepends ++ executableToolDepends;
+  nativeBuildInputs = buildTools ++ libraryToolDepends ++ executableToolDepends;
   propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends;
-  otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++
+  otherBuildInputs = setupHaskellDepends ++ extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++
                      optionals (allPkgconfigDepends != []) ([pkgconfig] ++ allPkgconfigDepends) ++
                      optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends) ++
                      # ghcjs's hsc2hs calls out to the native hsc2hs
@@ -231,11 +231,11 @@ stdenv.mkDerivation ({
     # libraries) from all the dependencies.
     local dynamicLinksDir="$out/lib/links"
     mkdir -p $dynamicLinksDir
-    for d in $(grep dynamic-library-dirs $packageConfDir/*|awk '{print $2}'); do
-      ln -s $d/*.dylib $dynamicLinksDir
+    for d in $(grep dynamic-library-dirs "$packageConfDir/"*|awk '{print $2}'); do
+      ln -s "$d/"*.dylib $dynamicLinksDir
     done
     # Edit the local package DB to reference the links directory.
-    for f in $packageConfDir/*.conf; do
+    for f in "$packageConfDir/"*.conf; do
       sed -i "s,dynamic-library-dirs: .*,dynamic-library-dirs: $dynamicLinksDir," $f
     done
   '') + ''
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 8c361341960..05b5678c074 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -478,7 +478,9 @@ self: {
      }) {};
 
   "ALUT" = callPackage
-    ({ mkDerivation, base, freealut, OpenAL, StateVar, transformers }:
+    ({ mkDerivation, base, freealut, OpenAL, pretty, StateVar
+     , transformers
+     }:
      mkDerivation {
        pname = "ALUT";
        version = "2.4.0.2";
@@ -487,6 +489,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base OpenAL StateVar transformers ];
        librarySystemDepends = [ freealut ];
+       executableHaskellDepends = [ base pretty ];
        homepage = "https://github.com/haskell-openal/ALUT";
        description = "A binding for the OpenAL Utility Toolkit";
        license = stdenv.lib.licenses.bsd3;
@@ -942,11 +945,12 @@ self: {
      }) {};
 
   "AppleScript" = callPackage
-    ({ mkDerivation }:
+    ({ mkDerivation, base }:
      mkDerivation {
        pname = "AppleScript";
        version = "0.2.0.1";
        sha256 = "1jmwixyv5msb3lmza7dljvm3l0x5mx8r93zr607sx9m5x9yhlsvr";
+       libraryHaskellDepends = [ base ];
        doHaddock = false;
        homepage = "https://github.com/reinerp/haskell-AppleScript";
        description = "Call AppleScript from Haskell, and then call back into Haskell";
@@ -2456,6 +2460,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "Cabal_2_0_0_2" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, containers
+     , deepseq, directory, filepath, pretty, process, QuickCheck, tagged
+     , tar, tasty, tasty-hunit, tasty-quickcheck, time, unix
+     }:
+     mkDerivation {
+       pname = "Cabal";
+       version = "2.0.0.2";
+       sha256 = "0chhl2113jbahd5gychx9rdqj1aw22h7dyj6z44871hzqxngx6bc";
+       libraryHaskellDepends = [
+         array base binary bytestring containers deepseq directory filepath
+         pretty process time unix
+       ];
+       testHaskellDepends = [
+         array base bytestring containers directory filepath pretty
+         QuickCheck tagged tar tasty tasty-hunit tasty-quickcheck
+       ];
+       doCheck = false;
+       homepage = "http://www.haskell.org/cabal/";
+       description = "A framework for packaging Haskell software";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Cabal-ide-backend" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, Cabal, containers
      , deepseq, directory, extensible-exceptions, filepath, HUnit
@@ -3489,14 +3517,21 @@ self: {
      }) {};
 
   "DMuCheck" = callPackage
-    ({ mkDerivation, base, MuCheck }:
+    ({ mkDerivation, base, binary, directory, distributed-process
+     , distributed-process-simplelocalnet, hint, MuCheck
+     , network-transport-tcp, unix
+     }:
      mkDerivation {
        pname = "DMuCheck";
        version = "0.3.0.2";
        sha256 = "00dhky0hnda85lvrs155jgwxnpqfm36cqakj3wp0yrn2xlz383ad";
        isLibrary = false;
        isExecutable = true;
-       executableHaskellDepends = [ base MuCheck ];
+       executableHaskellDepends = [
+         base binary directory distributed-process
+         distributed-process-simplelocalnet hint MuCheck
+         network-transport-tcp unix
+       ];
        homepage = "https://bitbucket.com/osu-testing/d-mucheck";
        description = "Distributed Mutation Analysis framework for MuCheck";
        license = stdenv.lib.licenses.gpl2;
@@ -3550,7 +3585,7 @@ self: {
          regex-posix split syb time unix
        ];
        libraryToolDepends = [ alex happy ];
-       executableHaskellDepends = [ base ];
+       executableHaskellDepends = [ array base bytestring HTF ];
        description = "Darcs Patch Manager";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -4503,7 +4538,7 @@ self: {
 
   "Earley" = callPackage
     ({ mkDerivation, base, criterion, deepseq, ListLike, parsec, tasty
-     , tasty-hunit, tasty-quickcheck
+     , tasty-hunit, tasty-quickcheck, unordered-containers
      }:
      mkDerivation {
        pname = "Earley";
@@ -4512,6 +4547,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ListLike ];
+       executableHaskellDepends = [ base unordered-containers ];
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        benchmarkHaskellDepends = [
          base criterion deepseq ListLike parsec
@@ -4523,6 +4559,7 @@ self: {
   "Earley_0_12_0_0" = callPackage
     ({ mkDerivation, base, criterion, deepseq, ListLike, parsec
      , QuickCheck, tasty, tasty-hunit, tasty-quickcheck
+     , unordered-containers
      }:
      mkDerivation {
        pname = "Earley";
@@ -4531,6 +4568,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ListLike ];
+       executableHaskellDepends = [ base unordered-containers ];
        testHaskellDepends = [
          base QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
@@ -5909,8 +5947,8 @@ self: {
      }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;};
 
   "GLUT" = callPackage
-    ({ mkDerivation, array, base, containers, OpenGL, StateVar
-     , transformers
+    ({ mkDerivation, array, base, bytestring, containers, OpenGL
+     , OpenGLRaw, random, StateVar, transformers
      }:
      mkDerivation {
        pname = "GLUT";
@@ -5921,6 +5959,9 @@ self: {
        libraryHaskellDepends = [
          array base containers OpenGL StateVar transformers
        ];
+       executableHaskellDepends = [
+         array base bytestring OpenGLRaw random
+       ];
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A binding for the OpenGL Utility Toolkit";
        license = stdenv.lib.licenses.bsd3;
@@ -8966,6 +9007,7 @@ self: {
          base containers HTTP hxt hxt-http mtl network network-uri parsec
          transformers
        ];
+       executableHaskellDepends = [ base hxt ];
        testHaskellDepends = [ base hspec hxt ];
        homepage = "https://github.com/egonSchiele/HandsomeSoup";
        description = "Work with HTML more easily in HXT";
@@ -9837,6 +9879,28 @@ self: {
        pname = "HsOpenSSL";
        version = "0.11.4.9";
        sha256 = "0y5khy8a1anisa8s1zysz763yg29mr6c9zcx4bjszaba5axyj3za";
+       revision = "1";
+       editedCabalFile = "0hxqmki50di5vkkfhb684kz3dvqx7gw7cxzdq2h3q10gdjki0avp";
+       setupHaskellDepends = [ base Cabal ];
+       libraryHaskellDepends = [
+         base bytestring integer-gmp network time
+       ];
+       librarySystemDepends = [ openssl ];
+       testHaskellDepends = [ base bytestring ];
+       homepage = "https://github.com/vshabanov/HsOpenSSL";
+       description = "Partial OpenSSL binding for Haskell";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) openssl;};
+
+  "HsOpenSSL_0_11_4_10" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, integer-gmp, network
+     , openssl, time
+     }:
+     mkDerivation {
+       pname = "HsOpenSSL";
+       version = "0.11.4.10";
+       sha256 = "1jlyjyfv421k176y4mjdxgvj3cp2a05xqwy0qlihbf9j385fz0l7";
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
          base bytestring integer-gmp network time
@@ -10440,6 +10504,10 @@ self: {
          attoparsec base bytestring bytestring-nums bytestring-trie
          containers utf8-string
        ];
+       executableHaskellDepends = [
+         attoparsec base bytestring bytestring-nums bytestring-trie
+         containers utf8-string
+       ];
        homepage = "http://github.com/solidsnack/JSONb/";
        description = "JSON parser that uses byte strings";
        license = stdenv.lib.licenses.bsd3;
@@ -10968,6 +11036,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ lber openldap ];
+       executableHaskellDepends = [ base ];
        testHaskellDepends = [ base HUnit ];
        testSystemDepends = [ lber openldap ];
        homepage = "https://github.com/ezyang/ldap-haskell";
@@ -11504,6 +11573,9 @@ self: {
          mtl multiset old-locale operational prefix-units pretty PSQueue
          sequential-index split stm time transformers void yjtools
        ];
+       executableHaskellDepends = [
+         base cereal cmdtheline containers transformers
+       ];
        testHaskellDepends = [
          base bytestring cereal composition containers data-ivar directory
          hslogger hslogger-template HUnit lens MonadCatchIO-transformers
@@ -11534,6 +11606,9 @@ self: {
          MonadCatchIO-transformers stm transformers
        ];
        librarySystemDepends = [ openmpi ];
+       executableHaskellDepends = [
+         base cereal cmdtheline hslogger LogicGrowsOnTrees
+       ];
        executableSystemDepends = [ openmpi ];
        description = "an adapter for LogicGrowsOnTrees that uses MPI";
        license = stdenv.lib.licenses.bsd3;
@@ -11557,6 +11632,9 @@ self: {
          hslogger-template lens LogicGrowsOnTrees MonadCatchIO-transformers
          mtl network pretty transformers
        ];
+       executableHaskellDepends = [
+         base cereal cmdtheline LogicGrowsOnTrees
+       ];
        testHaskellDepends = [
          base hslogger hslogger-template HUnit LogicGrowsOnTrees network
          random stm test-framework test-framework-hunit transformers
@@ -11583,6 +11661,9 @@ self: {
          hslogger hslogger-template LogicGrowsOnTrees
          MonadCatchIO-transformers process transformers
        ];
+       executableHaskellDepends = [
+         base cereal cmdtheline LogicGrowsOnTrees
+       ];
        testHaskellDepends = [
          base cereal hslogger hslogger-template HUnit LogicGrowsOnTrees
          random test-framework test-framework-hunit transformers
@@ -11943,6 +12024,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base newtype-generics ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/conal/MemoTrie";
        description = "Trie-based memo functions";
        license = stdenv.lib.licenses.bsd3;
@@ -12763,7 +12845,7 @@ self: {
      }) {};
 
   "NaturalSort" = callPackage
-    ({ mkDerivation, base, bytestring, strict }:
+    ({ mkDerivation, base, bytestring, QuickCheck, strict }:
      mkDerivation {
        pname = "NaturalSort";
        version = "0.2.1";
@@ -12771,6 +12853,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring strict ];
+       executableHaskellDepends = [ base bytestring QuickCheck strict ];
        homepage = "http://github.com/joachifm/natsort";
        description = "Natural sorting for strings";
        license = stdenv.lib.licenses.bsd3;
@@ -13456,6 +13539,7 @@ self: {
          base ObjectName OpenGL StateVar transformers
        ];
        librarySystemDepends = [ openal ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/haskell-openal/ALUT";
        description = "A binding to the OpenAL cross-platform 3D audio API";
        license = stdenv.lib.licenses.bsd3;
@@ -13551,6 +13635,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) mesa;};
 
+  "OpenGLRaw_3_2_5_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, fixed, half, mesa
+     , text, transformers
+     }:
+     mkDerivation {
+       pname = "OpenGLRaw";
+       version = "3.2.5.0";
+       sha256 = "1drxviqsx25isrxdq5f5gr5hrpfpbqcs7pj632qibmvpaqp4s3xg";
+       libraryHaskellDepends = [
+         base bytestring containers fixed half text transformers
+       ];
+       librarySystemDepends = [ mesa ];
+       homepage = "http://www.haskell.org/haskellwiki/Opengl";
+       description = "A raw binding for the OpenGL graphics system";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) mesa;};
+
   "OpenGLRaw21" = callPackage
     ({ mkDerivation, OpenGLRaw }:
      mkDerivation {
@@ -14196,6 +14298,7 @@ self: {
          data-default-class generic-accessors glib gtk3 lens text time
          transformers vector
        ];
+       executableHaskellDepends = [ base containers generic-accessors ];
        description = "Real-time line plotter for generic data";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -14693,8 +14796,8 @@ self: {
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
        pname = "QuickCheck-safe";
-       version = "0.1.0.2";
-       sha256 = "1y7qa29wxjkfjlx360k5s85gnppmz2qqdl9pfm49klq010k42vib";
+       version = "0.1.0.3";
+       sha256 = "0fwnywnmdws04f1y7qw0l8hawa2hn99x62g1mpjwcdx8dm4yal7f";
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Safe reimplementation of QuickCheck's core";
        license = stdenv.lib.licenses.mit;
@@ -15650,8 +15753,8 @@ self: {
      }) {};
 
   "SHA" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, QuickCheck
-     , test-framework, test-framework-quickcheck2
+    ({ mkDerivation, array, base, binary, bytestring, directory
+     , QuickCheck, test-framework, test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "SHA";
@@ -15660,6 +15763,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base binary bytestring ];
+       executableHaskellDepends = [ base bytestring directory ];
        testHaskellDepends = [
          array base binary bytestring QuickCheck test-framework
          test-framework-quickcheck2
@@ -15731,6 +15835,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "SSTG" = callPackage
+    ({ mkDerivation, base, containers, ghc, ghc-paths }:
+     mkDerivation {
+       pname = "SSTG";
+       version = "0.1.0.4";
+       sha256 = "0z61bv1mxmm1gq4b61gp3519fv0v7hb1cqcl4x8zp7cz5hgr8sr4";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base containers ghc ghc-paths ];
+       executableHaskellDepends = [ base containers ];
+       testHaskellDepends = [ base containers ];
+       homepage = "https://github.com/AntonXue/SSTG#readme";
+       description = "STG Symbolic Execution";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "STL" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, cereal, text }:
      mkDerivation {
@@ -17277,6 +17397,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mtl old-time time ];
+       executableHaskellDepends = [ base mtl old-time ];
        description = "Database library with left-fold interface, for PostgreSQL, Oracle, SQLite, ODBC";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -17330,6 +17451,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "TeX-my-math" = callPackage
+    ({ mkDerivation, base, decimal-literals, directory, dumb-cas
+     , filepath, hashable, haskell-src-meta, HaTeX, process
+     , template-haskell, text, unordered-containers, vector-space, void
+     }:
+     mkDerivation {
+       pname = "TeX-my-math";
+       version = "0.201.0.0";
+       sha256 = "0lrv0wybagc1zka9nq78qrdaygl4wbhkllw3w79cnmk1bagslxs4";
+       libraryHaskellDepends = [
+         base decimal-literals dumb-cas hashable haskell-src-meta HaTeX
+         template-haskell text unordered-containers vector-space void
+       ];
+       testHaskellDepends = [
+         base directory dumb-cas filepath haskell-src-meta HaTeX process
+         template-haskell text
+       ];
+       homepage = "http://github.com/leftaroundabout/Symbolic-math-HaTeX";
+       description = "Render general Haskell math to LaTeX. Or: math typesetting with high signal-to-noise–ratio.";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "TeaHS" = callPackage
     ({ mkDerivation, array, base, containers, mtl, SDL, SDL-image
      , SDL-mixer, SFont, Sprig
@@ -18598,6 +18742,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers directory Win32 ];
+       executableHaskellDepends = [ base directory ];
        description = "A binding to part of the Win32 library for file notification";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19161,6 +19306,8 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base deepseq random vector-space ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
        homepage = "https://github.com/ony/Yampa-core";
        description = "Library for programming hybrid systems";
        license = stdenv.lib.licenses.bsd3;
@@ -19400,6 +19547,7 @@ self: {
        ];
        librarySystemDepends = [ abc ];
        libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [ base base-compat ];
        testHaskellDepends = [
          aig base base-compat directory QuickCheck tasty tasty-ant-xml
          tasty-hunit tasty-quickcheck vector
@@ -20067,6 +20215,30 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "acid-state_0_14_3" = callPackage
+    ({ mkDerivation, array, base, bytestring, cereal, containers
+     , criterion, directory, extensible-exceptions, filepath, mtl
+     , network, random, safecopy, stm, system-fileio, system-filepath
+     , template-haskell, unix
+     }:
+     mkDerivation {
+       pname = "acid-state";
+       version = "0.14.3";
+       sha256 = "1d8hq8cj6h4crfnkmds6mhrhhg7r1b1byb8fybaj8khfa99sj0nm";
+       libraryHaskellDepends = [
+         array base bytestring cereal containers directory
+         extensible-exceptions filepath mtl network safecopy stm
+         template-haskell unix
+       ];
+       benchmarkHaskellDepends = [
+         base criterion directory mtl random system-fileio system-filepath
+       ];
+       homepage = "https://github.com/acid-state/acid-state";
+       description = "Add ACID guarantees to any serializable Haskell data structure";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "acid-state-dist" = callPackage
     ({ mkDerivation, acid-state, base, bytestring, cereal
      , concurrent-extra, containers, criterion, directory, filepath, mtl
@@ -21213,27 +21385,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "aeson-compat_0_3_7" = callPackage
+  "aeson-compat_0_3_7_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, attoparsec-iso8601, base
      , base-compat, base-orphans, bytestring, containers, exceptions
-     , hashable, nats, QuickCheck, quickcheck-instances, scientific
-     , semigroups, tagged, tasty, tasty-hunit, tasty-quickcheck, text
-     , time, time-locale-compat, unordered-containers, vector
+     , hashable, QuickCheck, quickcheck-instances, scientific, tagged
+     , tasty, tasty-hunit, tasty-quickcheck, text, time
+     , time-locale-compat, unordered-containers, vector
      }:
      mkDerivation {
        pname = "aeson-compat";
-       version = "0.3.7";
-       sha256 = "053wa7j82pymr633vakpdandrddg083zcmv76g9sbawcsfiw5whv";
+       version = "0.3.7.1";
+       sha256 = "1jya3lm9imclhb8qqihv39hhb62vvs3qpws7pc5fc23vwg0hsx2r";
        libraryHaskellDepends = [
          aeson attoparsec attoparsec-iso8601 base base-compat bytestring
-         containers exceptions hashable nats scientific semigroups tagged
-         text time time-locale-compat unordered-containers vector
+         containers exceptions hashable scientific tagged text time
+         time-locale-compat unordered-containers vector
        ];
        testHaskellDepends = [
          aeson attoparsec base base-compat base-orphans bytestring
-         containers exceptions hashable nats QuickCheck quickcheck-instances
-         scientific semigroups tagged tasty tasty-hunit tasty-quickcheck
-         text time time-locale-compat unordered-containers vector
+         containers exceptions hashable QuickCheck quickcheck-instances
+         scientific tagged tasty tasty-hunit tasty-quickcheck text time
+         time-locale-compat unordered-containers vector
        ];
        homepage = "https://github.com/phadej/aeson-compat#readme";
        description = "Compatibility layer for aeson";
@@ -21299,6 +21471,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "aeson-extra_0_4_1_0" = callPackage
+    ({ mkDerivation, aeson, aeson-compat, attoparsec
+     , attoparsec-iso8601, base, base-compat, bytestring, containers
+     , deepseq, exceptions, hashable, parsec, quickcheck-instances
+     , recursion-schemes, scientific, tasty, tasty-hunit
+     , tasty-quickcheck, template-haskell, text, these, time
+     , time-parsers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "aeson-extra";
+       version = "0.4.1.0";
+       sha256 = "11chkybn96q39j9y4h2wmq5vs0a0sb24qvk0g1qq8kyaiahvsd8y";
+       libraryHaskellDepends = [
+         aeson aeson-compat attoparsec attoparsec-iso8601 base base-compat
+         bytestring containers deepseq exceptions hashable parsec
+         recursion-schemes scientific template-haskell text these time
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base containers quickcheck-instances tasty tasty-hunit
+         tasty-quickcheck these time time-parsers unordered-containers
+         vector
+       ];
+       homepage = "https://github.com/phadej/aeson-extra#readme";
+       description = "Extra goodies for aeson";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "aeson-filthy" = callPackage
     ({ mkDerivation, aeson, base, bytestring, doctest, text
      , unordered-containers
@@ -21348,6 +21549,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "aeson-flowtyped" = callPackage
+    ({ mkDerivation, aeson, base, containers, free, recursion-schemes
+     , reflection, scientific, tasty, tasty-hunit, text, time
+     , unordered-containers, vector, wl-pprint
+     }:
+     mkDerivation {
+       pname = "aeson-flowtyped";
+       version = "0.7.1";
+       sha256 = "1b0dqscd7dz14flmjzinzdck99sqpjg4qnhy0wdl9bjajf7bfbhb";
+       libraryHaskellDepends = [
+         aeson base containers free recursion-schemes reflection scientific
+         text time unordered-containers vector wl-pprint
+       ];
+       testHaskellDepends = [
+         aeson base recursion-schemes tasty tasty-hunit text vector
+       ];
+       description = "Create Flow type definitions from Haskell data types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "aeson-generic-compat" = callPackage
     ({ mkDerivation, aeson, base }:
      mkDerivation {
@@ -21904,6 +22125,11 @@ self: {
          fclabels mtl network pipes pipes-concurrency pipes-network safe
          snmp time transformers unix
        ];
+       executableHaskellDepends = [
+         base binary bitwise bytestring containers data-default Diff
+         fclabels mtl network pipes pipes-concurrency pipes-network safe
+         snmp time transformers unix
+       ];
        description = "AgentX protocol for write SNMP subagents";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -22386,8 +22612,8 @@ self: {
     ({ mkDerivation, base, deepseq, template-haskell, text }:
      mkDerivation {
        pname = "alex-tools";
-       version = "0.2.0.0";
-       sha256 = "0vhqq8d138hgjas6697pwzij6wqc9pn8ix64bs17mhiyq3ygmyvg";
+       version = "0.2.0.1";
+       sha256 = "1szwa4cz9nx6rxfgg58d3j4q90zv80cvfzaq47bvlb3vb2pai4nh";
        libraryHaskellDepends = [ base deepseq template-haskell text ];
        description = "A set of functions for a common use case of Alex";
        license = stdenv.lib.licenses.isc;
@@ -22519,12 +22745,13 @@ self: {
     ({ mkDerivation, base, syb, template-haskell }:
      mkDerivation {
        pname = "algebraic-classes";
-       version = "0.7.1";
-       sha256 = "0w0p3qzvwyj3ijdggaaagcd1x9iwnzxk9yi9vqba63xdbzr18zrc";
+       version = "0.8";
+       sha256 = "1ihrxm3gn4558wlwlm8wagq133ipy04kc3d6wsx0an83wyrcnz1w";
        libraryHaskellDepends = [ base syb template-haskell ];
        homepage = "https://github.com/sjoerdvisscher/algebraic-classes";
        description = "Conversions between algebraic classes and F-algebras";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "algebraic-graphs" = callPackage
@@ -22554,6 +22781,7 @@ self: {
        libraryHaskellDepends = [
          algebra base basic-prelude lens semigroups
        ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/konn/algebraic-prelude#readme";
        description = "Algebraically structured Prelude";
        license = stdenv.lib.licenses.bsd3;
@@ -25296,6 +25524,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/feuerbach/ansi-terminal";
        description = "Simple ANSI terminal support, with Windows compatibility";
        license = stdenv.lib.licenses.bsd3;
@@ -25310,6 +25539,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ ansi-terminal base ];
+       executableHaskellDepends = [ ansi-terminal base ];
        homepage = "http://github.com/ekmett/ansi-wl-pprint";
        description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output";
        license = stdenv.lib.licenses.bsd3;
@@ -25510,6 +25740,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers MissingH mtl ];
+       executableHaskellDepends = [ base containers MissingH mtl ];
        homepage = "http://software.complete.org/anydbm";
        description = "Interface for DBM-like database systems";
        license = "GPL";
@@ -26255,8 +26486,8 @@ self: {
      }:
      mkDerivation {
        pname = "apply-refact";
-       version = "0.4.0.0";
-       sha256 = "1s25nlkbfzjr6b5psii3n7hmwvg7lgvaljp1ilq5y82rq8sfyxps";
+       version = "0.4.1.0";
+       sha256 = "00hmfdwyrva90wnkww2n6jl7h6s24brz58cacqy8wkgacqrb73kw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -27502,6 +27733,8 @@ self: {
        pname = "ast-monad";
        version = "0.1.0.0";
        sha256 = "038cvblhhlcsv9id2rcb26q4lwvals3xj45j9jy6fb69jm5mzh0i";
+       revision = "1";
+       editedCabalFile = "1rvdxx5gl22jp528z7b75fwm1dhfsdx2hhvwvfaw3wc59a66gmml";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/mkdag/ast-monad#readme";
@@ -27786,7 +28019,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "async-refresh-tokens_0_2_0_0" = callPackage
+  "async-refresh-tokens_0_3_0_0" = callPackage
     ({ mkDerivation, async-refresh, base, bytestring, criterion
      , formatting, HUnit, lifted-async, microlens, microlens-th
      , monad-control, monad-logger, safe-exceptions, stm, test-framework
@@ -27794,8 +28027,8 @@ self: {
      }:
      mkDerivation {
        pname = "async-refresh-tokens";
-       version = "0.2.0.0";
-       sha256 = "1inpl44hmk4g5y0p09wdg85k921174zz5f5kn0z69b13gfrhncw6";
+       version = "0.3.0.0";
+       sha256 = "11kwkqxxqipfl193wk1a441r8jr6h1lj50xrzmpjhqmacwr212nm";
        libraryHaskellDepends = [
          async-refresh base bytestring formatting lifted-async microlens
          microlens-th monad-control monad-logger safe-exceptions stm text
@@ -28806,6 +29039,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "autoexporter_1_1_2" = callPackage
+    ({ mkDerivation, base, Cabal, directory, filepath }:
+     mkDerivation {
+       pname = "autoexporter";
+       version = "1.1.2";
+       sha256 = "1n7pzpxz3bb4l20hy53qdda4r1gwf6j47py08n9w568j7hygrklx";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base Cabal directory filepath ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/tfausak/autoexporter#readme";
+       description = "Automatically re-export modules";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "autom" = callPackage
     ({ mkDerivation, base, bytestring, colour, ghc-prim, gloss
      , JuicyPixels, random, vector
@@ -30111,6 +30360,8 @@ self: {
        pname = "ballast";
        version = "0.1.0.0";
        sha256 = "1skzfj5l4j1jgpc0dlqmwpysa4bf9f9jpllz6zqb17zknicd77qf";
+       revision = "1";
+       editedCabalFile = "0lcxvxrpsbr5ibcwda6vrhrsc55grwabfikw34bc9r1rv293399i";
        libraryHaskellDepends = [
          aeson base bytestring either-unwrap hspec hspec-expectations
          http-client http-client-tls http-types text time transformers
@@ -30119,7 +30370,7 @@ self: {
        testHaskellDepends = [
          base bytestring either-unwrap hspec hspec-expectations text time
        ];
-       homepage = "https://github.com/bitemyapp/ballast#readme";
+       homepage = "https://github.com/alexeyzab/ballast#readme";
        description = "Shipwire API client";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -30247,8 +30498,8 @@ self: {
      }) {};
 
   "bamse" = callPackage
-    ({ mkDerivation, base, com, directory, filepath, old-time, pretty
-     , process, regex-compat
+    ({ mkDerivation, base, com, directory, filepath, HUnit, old-time
+     , pretty, process, QuickCheck, regex-compat
      }:
      mkDerivation {
        pname = "bamse";
@@ -30259,6 +30510,7 @@ self: {
        libraryHaskellDepends = [
          base com directory filepath old-time pretty process regex-compat
        ];
+       executableHaskellDepends = [ HUnit QuickCheck ];
        description = "A Windows Installer (MSI) generator framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -30436,17 +30688,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "base_4_9_1_0" = callPackage
-    ({ mkDerivation, ghc-prim, integer-gmp, rts }:
+  "base_4_10_0_0" = callPackage
+    ({ mkDerivation, ghc-prim, invalid-cabal-flag-settings, rts }:
      mkDerivation {
        pname = "base";
-       version = "4.9.1.0";
-       sha256 = "0zpvf4yq52dkl9f30w6x4fv1lqcc175i57prhv56ky06by08anvs";
-       libraryHaskellDepends = [ ghc-prim integer-gmp rts ];
+       version = "4.10.0.0";
+       sha256 = "06sgjlf3v3yyp0rdyi3f7qlp5iqw7kg0zrwml9lmccdy93pahclv";
+       libraryHaskellDepends = [
+         ghc-prim invalid-cabal-flag-settings rts
+       ];
        description = "Basic libraries";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+       broken = true;
+     }) {invalid-cabal-flag-settings = null;};
 
   "base-compat" = callPackage
     ({ mkDerivation, base, hspec, QuickCheck, unix }:
@@ -30511,6 +30766,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "base-noprelude_4_10_0_0" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "base-noprelude";
+       version = "4.10.0.0";
+       sha256 = "1jc1szrja1651vf73kprsa0yq73w331i1g08p54w1znkilf7jalf";
+       libraryHaskellDepends = [ base ];
+       doHaddock = false;
+       homepage = "https://github.com/hvr/base-noprelude";
+       description = "\"base\" package sans \"Prelude\" module";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "base-orphans" = callPackage
     ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }:
      mkDerivation {
@@ -33253,7 +33522,8 @@ self: {
 
   "bio" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
-     , directory, mtl, parallel, parsec, QuickCheck, random, tagsoup
+     , directory, mtl, old-time, parallel, parsec, process, QuickCheck
+     , random, tagsoup
      }:
      mkDerivation {
        pname = "bio";
@@ -33265,7 +33535,9 @@ self: {
          array base binary bytestring containers directory mtl parallel
          parsec QuickCheck tagsoup
        ];
-       executableHaskellDepends = [ base bytestring random ];
+       executableHaskellDepends = [
+         base bytestring containers old-time process QuickCheck random
+       ];
        homepage = "http://biohaskell.org/Libraries/Bio";
        description = "A bioinformatics library";
        license = "LGPL";
@@ -33514,6 +33786,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base vector ];
+       executableHaskellDepends = [ base vector ];
        testHaskellDepends = [
          base QuickCheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck
          vector
@@ -33522,6 +33795,7 @@ self: {
        homepage = "https://github.com/Bodigrim/bit-stream#readme";
        description = "Lazy, infinite, compact stream of 'Bool' with O(1) indexing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bit-vector" = callPackage
@@ -34935,8 +35209,8 @@ self: {
      }:
      mkDerivation {
        pname = "bloodhound-amazonka-auth";
-       version = "0.1.1.0";
-       sha256 = "0145hn23jjk7kfcqj9dr2bk3my90nfdb3k805cpmbmg0w15s34ng";
+       version = "0.1.2.0";
+       sha256 = "1r9fj8zh9swdmy0f96112kpm1s50wlyf194w2km4rpq2hblcjlrm";
        libraryHaskellDepends = [
          amazonka-core amazonka-elasticsearch base bloodhound exceptions
          http-client http-types time transformers uri-bytestring
@@ -35168,6 +35442,7 @@ self: {
        homepage = "https://bitbucket.org/fmapE/bno055-haskell";
        description = "Library for communication with the Bosch BNO055 orientation sensor";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "board-games" = callPackage
@@ -35655,7 +35930,7 @@ self: {
      }) {};
 
   "boring-window-switcher" = callPackage
-    ({ mkDerivation, base, gtk, transformers, X11 }:
+    ({ mkDerivation, base, gtk, hspec, transformers, X11 }:
      mkDerivation {
        pname = "boring-window-switcher";
        version = "0.1.0.4";
@@ -35664,6 +35939,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base gtk transformers X11 ];
        executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/debug-ito/boring-window-switcher";
        description = "A boring window switcher";
        license = stdenv.lib.licenses.bsd3;
@@ -36019,6 +36295,9 @@ self: {
          microlens-th stm template-haskell text text-zipper transformers
          vector vty
        ];
+       executableHaskellDepends = [
+         base microlens microlens-th text text-zipper vector vty
+       ];
        homepage = "https://github.com/jtdaugherty/brick/";
        description = "A declarative terminal user interface library";
        license = stdenv.lib.licenses.bsd3;
@@ -36041,6 +36320,9 @@ self: {
          microlens-mtl microlens-th stm template-haskell text text-zipper
          transformers vector vty word-wrap
        ];
+       executableHaskellDepends = [
+         base microlens microlens-th text text-zipper vector vty
+       ];
        homepage = "https://github.com/jtdaugherty/brick/";
        description = "A declarative terminal user interface library";
        license = stdenv.lib.licenses.bsd3;
@@ -36457,6 +36739,7 @@ self: {
          data-default http-conduit http-types iso8601-time resourcet text
          time transformers unordered-containers vector
        ];
+       executableHaskellDepends = [ base containers text time ];
        homepage = "https://github.com/sethfowler/hsbugzilla";
        description = "A Haskell interface to the Bugzilla native REST API";
        license = stdenv.lib.licenses.bsd3;
@@ -36484,6 +36767,8 @@ self: {
        pname = "buildbox";
        version = "2.1.9.3";
        sha256 = "1ffvf82qmf05vxzxi70jm1yq8apv5s62nms529n6x1p5lyrwwdr5";
+       revision = "1";
+       editedCabalFile = "0nqhdmkmgnqgfw8vkjnwbrzrj7lvrhc0gw23p8smxkppvh6y5zv3";
        libraryHaskellDepends = [
          base bytestring containers directory exceptions mtl old-locale
          pretty process stm temporary text time
@@ -36727,6 +37012,10 @@ self: {
          base bifunctors containers deque either extra free microlens
          microlens-th mtl multistate pretty transformers unsafe void
        ];
+       testHaskellDepends = [
+         base containers deque either extra free microlens microlens-th mtl
+         multistate pretty transformers unsafe
+       ];
        homepage = "https://github.com/lspitzner/butcher/";
        description = "Chops a command or program invocation into digestable pieces";
        license = stdenv.lib.licenses.bsd3;
@@ -36782,6 +37071,7 @@ self: {
          ansi-terminal base colour containers exceptions haskeline mtl
          terminfo-hs text transformers
        ];
+       executableHaskellDepends = [ base text ];
        homepage = "http://github.com/pjones/byline";
        description = "Library for creating command-line interfaces (colors, menus, etc.)";
        license = stdenv.lib.licenses.bsd2;
@@ -36871,15 +37161,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "bytestring_0_10_8_1" = callPackage
+  "bytestring_0_10_8_2" = callPackage
     ({ mkDerivation, base, byteorder, deepseq, directory, dlist
      , ghc-prim, HUnit, integer-gmp, mtl, QuickCheck, random
      , test-framework, test-framework-hunit, test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "bytestring";
-       version = "0.10.8.1";
-       sha256 = "16zwb1p83z7vc5wlhvknpy80b5a2jxc5awx67rk52qnp9idmyq9d";
+       version = "0.10.8.2";
+       sha256 = "0fjc5ybxx67l0kh27l6vq4saf88hp1wnssj5ka90ii588y76cvys";
        libraryHaskellDepends = [ base deepseq ghc-prim integer-gmp ];
        testHaskellDepends = [
          base byteorder deepseq directory dlist ghc-prim HUnit mtl
@@ -37691,6 +37981,10 @@ self: {
        executableHaskellDepends = [
          base Cabal debian lens mtl pretty Unixutils
        ];
+       testHaskellDepends = [
+         base Cabal containers debian Diff directory filepath hsemail HUnit
+         lens pretty process text
+       ];
        homepage = "https://github.com/ddssff/cabal-debian";
        description = "Create a Debianization for a Cabal package";
        license = stdenv.lib.licenses.bsd3;
@@ -39020,6 +39314,7 @@ self: {
          OpenGL OpenGLRaw random template-haskell text transformers vector
          WAVE
        ];
+       executableHaskellDepends = [ base lens ];
        homepage = "https://github.com/fumieval/call";
        description = "The call game engine";
        license = stdenv.lib.licenses.bsd3;
@@ -39465,6 +39760,8 @@ self: {
        pname = "carray";
        version = "0.1.6.7";
        sha256 = "0b5zabyfzi60llvimk2hfw93r38qfl3z5kjhp71rdgqj0alaxmx9";
+       revision = "1";
+       editedCabalFile = "0fbpqacz1n60bmvwnhhlz97b715060yr5xh3wzkpqnl4qq44vmgv";
        libraryHaskellDepends = [
          array base binary bytestring ix-shapable QuickCheck syb
        ];
@@ -39474,6 +39771,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "carray_0_1_6_8" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, ix-shapable
+     , QuickCheck, syb
+     }:
+     mkDerivation {
+       pname = "carray";
+       version = "0.1.6.8";
+       sha256 = "04qny61gcjblqjrz761wp4bdkxk6zbm31xn6h426iybw9kanf6cg";
+       libraryHaskellDepends = [
+         array base binary bytestring ix-shapable QuickCheck syb
+       ];
+       testHaskellDepends = [ array base ix-shapable QuickCheck ];
+       benchmarkHaskellDepends = [ array base ];
+       description = "A C-compatible array library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "carte" = callPackage
     ({ mkDerivation, base, filepath, mtl, network, optparse-applicative
      , random, semigroups, time, transformers, tuple
@@ -41036,6 +41351,7 @@ self: {
          array base binary bytestring Codec-Image-DevIL containers
          data-reify directory GLUT OpenGLRaw process time
        ];
+       executableHaskellDepends = [ base ];
        homepage = "http://www.ittc.ku.edu/csdl/fpg/ChalkBoard";
        description = "Combinators for building and processing 2D images";
        license = stdenv.lib.licenses.bsd3;
@@ -41197,16 +41513,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "chart-unit_0_3_2" = callPackage
-    ({ mkDerivation, ad, base, colour, diagrams-lib, diagrams-svg
-     , foldl, formatting, lens, linear, mwc-probability, mwc-random
-     , numhask, numhask-range, primitive, protolude, reflection, tasty
-     , tasty-hspec, tdigest, text
+  "chart-unit_0_4_1" = callPackage
+    ({ mkDerivation, ad, base, colour, diagrams-lib
+     , diagrams-rasterific, diagrams-svg, foldl, formatting, JuicyPixels
+     , lens, linear, mwc-probability, mwc-random, numhask, numhask-range
+     , primitive, protolude, reflection, tasty, tasty-hspec, tdigest
+     , text
      }:
      mkDerivation {
        pname = "chart-unit";
-       version = "0.3.2";
-       sha256 = "06yilm8ldkf59vxycydfhn990x6lmykgma2nwc87mxnqc6820a22";
+       version = "0.4.1";
+       sha256 = "0ry6j00rmkbv9z98d7i6zmj5sxh4ram4nyaw39k2kgaxkgfa1iag";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -41214,12 +41531,13 @@ self: {
          numhask numhask-range text
        ];
        executableHaskellDepends = [
-         ad base foldl mwc-probability mwc-random numhask primitive
-         protolude reflection tdigest text
+         ad base diagrams-lib diagrams-rasterific foldl JuicyPixels
+         mwc-probability mwc-random numhask primitive protolude reflection
+         tdigest text
        ];
        testHaskellDepends = [ base numhask tasty tasty-hspec ];
        homepage = "https://github.com/tonyday567/chart-unit";
-       description = "A set of native haskell charts";
+       description = "Native haskell charts";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -41348,11 +41666,13 @@ self: {
        homepage = "https://github.com/matsubara0507/chatwork#readme";
        description = "The ChatWork API in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cheapskate" = callPackage
-    ({ mkDerivation, base, blaze-html, bytestring, containers
-     , data-default, mtl, syb, text, uniplate, xss-sanitize
+    ({ mkDerivation, aeson, base, blaze-html, bytestring, containers
+     , data-default, http-types, mtl, syb, text, uniplate, wai
+     , wai-extra, xss-sanitize
      }:
      mkDerivation {
        pname = "cheapskate";
@@ -41366,7 +41686,9 @@ self: {
          base blaze-html containers data-default mtl syb text uniplate
          xss-sanitize
        ];
-       executableHaskellDepends = [ base blaze-html bytestring text ];
+       executableHaskellDepends = [
+         aeson base blaze-html bytestring http-types text wai wai-extra
+       ];
        homepage = "http://github.com/jgm/cheapskate";
        description = "Experimental markdown processor";
        license = stdenv.lib.licenses.bsd3;
@@ -41394,6 +41716,8 @@ self: {
        pname = "cheapskate-lucid";
        version = "0.1.0.0";
        sha256 = "0ibjfy5dbkizg8cw4avhwl62xpk735a1a7bc0nkhf9zxpq9fb0pm";
+       revision = "1";
+       editedCabalFile = "197nx95xw21i7zyvgzcgnr36ab6vrk17c66iz8ndwz61vp1jf6hc";
        libraryHaskellDepends = [ base blaze-html cheapskate lucid ];
        homepage = "http://github.com/aelve/cheapskate-lucid";
        description = "Use cheapskate with Lucid";
@@ -42418,8 +42742,8 @@ self: {
 
   "clang-pure" = callPackage
     ({ mkDerivation, base, bytestring, clang, containers, contravariant
-     , inline-c, microlens, microlens-contra, singletons, stm
-     , template-haskell, vector
+     , hashable, inline-c, lens, microlens, microlens-contra, singletons
+     , stm, template-haskell, unordered-containers, vector
      }:
      mkDerivation {
        pname = "clang-pure";
@@ -42432,6 +42756,9 @@ self: {
          microlens-contra singletons stm template-haskell vector
        ];
        librarySystemDepends = [ clang ];
+       executableHaskellDepends = [
+         base bytestring hashable lens unordered-containers
+       ];
        description = "Pure C++ code analysis with libclang";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -42839,6 +43166,40 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openssl;};
 
+  "clckwrks_0_24_0_4" = callPackage
+    ({ mkDerivation, acid-state, aeson, aeson-qq, attoparsec, base
+     , blaze-html, bytestring, cereal, containers, directory, filepath
+     , happstack-authenticate, happstack-hsp, happstack-jmacro
+     , happstack-server, happstack-server-tls, hsp, hsx-jmacro, hsx2hs
+     , ixset, jmacro, lens, mtl, network, network-uri, old-locale
+     , openssl, process, random, reform, reform-happstack, reform-hsp
+     , safecopy, stm, text, time, time-locale-compat
+     , unordered-containers, userid, utf8-string, uuid-orphans
+     , uuid-types, vector, web-plugins, web-routes, web-routes-happstack
+     , web-routes-hsp, web-routes-th, xss-sanitize
+     }:
+     mkDerivation {
+       pname = "clckwrks";
+       version = "0.24.0.4";
+       sha256 = "0xpv3qb7w1bzszbnmzriai9dv9qfajnv1pv9y3jdaih4gj73c9ny";
+       libraryHaskellDepends = [
+         acid-state aeson aeson-qq attoparsec base blaze-html bytestring
+         cereal containers directory filepath happstack-authenticate
+         happstack-hsp happstack-jmacro happstack-server
+         happstack-server-tls hsp hsx-jmacro hsx2hs ixset jmacro lens mtl
+         network network-uri old-locale process random reform
+         reform-happstack reform-hsp safecopy stm text time
+         time-locale-compat unordered-containers userid utf8-string
+         uuid-orphans uuid-types vector web-plugins web-routes
+         web-routes-happstack web-routes-hsp web-routes-th xss-sanitize
+       ];
+       librarySystemDepends = [ openssl ];
+       homepage = "http://www.clckwrks.com/";
+       description = "A secure, reliable content management system (CMS) and blogging platform";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) openssl;};
+
   "clckwrks-cli" = callPackage
     ({ mkDerivation, acid-state, base, clckwrks, haskeline, mtl
      , network, parsec
@@ -42916,8 +43277,8 @@ self: {
      }:
      mkDerivation {
        pname = "clckwrks-plugin-ircbot";
-       version = "0.6.17.2";
-       sha256 = "0aqal0r72zbjximdkc9g3252f8iq1qz7sphp53s5z3w5cnwrsfv8";
+       version = "0.6.17.3";
+       sha256 = "1fk6jyjvkqs11khj8mriqbj56kz19ayhha3kq79cnhjm8c7184cb";
        libraryHaskellDepends = [
          acid-state attoparsec base blaze-html bytestring clckwrks
          containers directory filepath happstack-hsp happstack-server hsp
@@ -42931,6 +43292,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "clckwrks-plugin-mailinglist" = callPackage
+    ({ mkDerivation, acid-state, attoparsec, base, bytestring, clckwrks
+     , containers, directory, filepath, happstack-authenticate
+     , happstack-hsp, happstack-server, hsp, HStringTemplate, hsx2hs
+     , html-email-validate, ixset, lens, mime-mail, mtl, network-uri
+     , reform, reform-happstack, reform-hsp, safecopy, text, time, uuid
+     , uuid-orphans, web-plugins, web-routes, web-routes-th
+     }:
+     mkDerivation {
+       pname = "clckwrks-plugin-mailinglist";
+       version = "0.3.0.2";
+       sha256 = "1zhcqkzas3pcnviwka0v174spq8wn457kvmxk6nafcxkwf27p52m";
+       libraryHaskellDepends = [
+         acid-state attoparsec base bytestring clckwrks containers directory
+         filepath happstack-authenticate happstack-hsp happstack-server hsp
+         HStringTemplate hsx2hs html-email-validate ixset lens mime-mail mtl
+         network-uri reform reform-happstack reform-hsp safecopy text time
+         uuid uuid-orphans web-plugins web-routes web-routes-th
+       ];
+       homepage = "http://www.clckwrks.com/";
+       description = "mailing list plugin for clckwrks";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "clckwrks-plugin-media" = callPackage
     ({ mkDerivation, acid-state, attoparsec, base, blaze-html, cereal
      , clckwrks, containers, directory, filepath, gd, happstack-server
@@ -42955,6 +43340,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "clckwrks-plugin-media_0_6_16_4" = callPackage
+    ({ mkDerivation, acid-state, attoparsec, base, blaze-html, cereal
+     , clckwrks, containers, directory, filepath, gd, happstack-server
+     , hsp, hsx2hs, ixset, magic, mtl, reform, reform-happstack
+     , reform-hsp, safecopy, text, web-plugins, web-routes
+     , web-routes-th
+     }:
+     mkDerivation {
+       pname = "clckwrks-plugin-media";
+       version = "0.6.16.4";
+       sha256 = "19fv38gqslg01ymj3nb838pnhir92gfkyl6kccik39brgcfd915b";
+       libraryHaskellDepends = [
+         acid-state attoparsec base blaze-html cereal clckwrks containers
+         directory filepath gd happstack-server hsp ixset magic mtl reform
+         reform-happstack reform-hsp safecopy text web-plugins web-routes
+         web-routes-th
+       ];
+       libraryToolDepends = [ hsx2hs ];
+       homepage = "http://clckwrks.com/";
+       description = "media plugin for clckwrks";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "clckwrks-plugin-page" = callPackage
     ({ mkDerivation, acid-state, aeson, attoparsec, base, clckwrks
      , containers, directory, filepath, happstack-hsp, happstack-server
@@ -42981,6 +43390,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "clckwrks-plugin-page_0_4_3_10" = callPackage
+    ({ mkDerivation, acid-state, aeson, attoparsec, base, clckwrks
+     , containers, directory, filepath, happstack-hsp, happstack-server
+     , hsp, hsx2hs, ixset, mtl, old-locale, random, reform
+     , reform-happstack, reform-hsp, safecopy, tagsoup, template-haskell
+     , text, time, time-locale-compat, uuid, uuid-orphans, web-plugins
+     , web-routes, web-routes-happstack, web-routes-th
+     }:
+     mkDerivation {
+       pname = "clckwrks-plugin-page";
+       version = "0.4.3.10";
+       sha256 = "0ijwfl4wj0pjv6hfac6fbrvcg3all9p2wx2w1lirjvn5kgwjj5r2";
+       libraryHaskellDepends = [
+         acid-state aeson attoparsec base clckwrks containers directory
+         filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl
+         old-locale random reform reform-happstack reform-hsp safecopy
+         tagsoup template-haskell text time time-locale-compat uuid
+         uuid-orphans web-plugins web-routes web-routes-happstack
+         web-routes-th
+       ];
+       homepage = "http://www.clckwrks.com/";
+       description = "support for CMS/Blogging in clckwrks";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "clckwrks-theme-bootstrap" = callPackage
     ({ mkDerivation, base, clckwrks, happstack-authenticate, hsp
      , hsx-jmacro, hsx2hs, jmacro, mtl, text, web-plugins
@@ -43833,6 +44268,8 @@ self: {
        pname = "cmark-lucid";
        version = "0.1.0.0";
        sha256 = "00rwiax7dd01259vrdkv574zi58agr17p7jkzixgwchfxngpp4nj";
+       revision = "1";
+       editedCabalFile = "1mizbv18bl8qrgz27wlz7sb6cfhblmp7p7gh7dqq8g0r4djrvqg5";
        libraryHaskellDepends = [ base cmark lucid ];
        homepage = "http://github.com/aelve/cmark-lucid";
        description = "Use cmark with Lucid";
@@ -43922,6 +44359,9 @@ self: {
        libraryHaskellDepends = [
          base filepath process template-haskell transformers
        ];
+       executableHaskellDepends = [
+         base filepath process template-haskell transformers
+       ];
        homepage = "https://github.com/ndmitchell/cmdargs#readme";
        description = "Command line argument processing";
        license = stdenv.lib.licenses.bsd3;
@@ -44206,6 +44646,7 @@ self: {
        homepage = "https://github.com/weldr/codec-rpm";
        description = "A library for manipulating RPM files";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "codecov-haskell" = callPackage
@@ -45162,8 +45603,8 @@ self: {
        homepage = "https://github.com/ezyang/compact";
        description = "Non-GC'd, contiguous storage for immutable data structures";
        license = stdenv.lib.licenses.bsd3;
-       broken = true;
-     }) {ghc-compact = null;};
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
 
   "compact-map" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers }:
@@ -45197,8 +45638,8 @@ self: {
        homepage = "https://github.com/andrewthad/compact-mutable#readme";
        description = "Mutable arrays living on the compact heap";
        license = stdenv.lib.licenses.bsd3;
-       broken = true;
-     }) {ghc-compact = null;};
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
 
   "compact-socket" = callPackage
     ({ mkDerivation, base, binary, bytestring, compact, deepseq
@@ -45475,6 +45916,39 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "composable-associations" = callPackage
+    ({ mkDerivation, base, lens, tasty, tasty-hunit }:
+     mkDerivation {
+       pname = "composable-associations";
+       version = "0.1.0.0";
+       sha256 = "03l056yb6k8x5xrfdszsn4w2739zyiqzrl6q3ci19dg1gsy106lx";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base lens tasty tasty-hunit ];
+       homepage = "https://github.com/SamProtas/composable-associations#readme";
+       description = "Types and helpers for composing types into a single larger key-value type";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "composable-associations-aeson" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, composable-associations
+     , doctest, tasty, tasty-hunit, tasty-quickcheck, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "composable-associations-aeson";
+       version = "0.1.0.0";
+       sha256 = "0kragi8wfd30yxrndxka5p3bivj1qi8svljcdkqnji32dpnm9myv";
+       libraryHaskellDepends = [
+         aeson base composable-associations text unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring doctest tasty tasty-hunit tasty-quickcheck
+       ];
+       homepage = "https://github.com/SamProtas/composable-associations#readme";
+       description = "Aeson ToJSON/FromJSON implementation for the types of composable-associations";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "compose-ltr" = callPackage
     ({ mkDerivation, base, hspec, QuickCheck }:
      mkDerivation {
@@ -45727,12 +46201,12 @@ self: {
      , constraints, containers, control-monad-loop, convertible
      , criterion, deepseq, dlist, entropy, equational-reasoning
      , ghc-typelits-knownnat, hashable, heaps, hmatrix, hspec, HUnit
-     , hybrid-vectors, lens, matrix, monad-loops, MonadRandom
-     , mono-traversable, monomorphic, mtl, parallel, primes, process
-     , QuickCheck, quickcheck-instances, random, reflection, semigroups
-     , singletons, sized, smallcheck, tagged, template-haskell
-     , test-framework, test-framework-hunit, text, transformers
-     , type-natural, unamb, unordered-containers, vector
+     , hybrid-vectors, lazysmallcheck, lens, matrix, monad-loops
+     , MonadRandom, mono-traversable, monomorphic, mtl, parallel, primes
+     , process, QuickCheck, quickcheck-instances, random, reflection
+     , semigroups, singletons, sized, smallcheck, tagged
+     , template-haskell, test-framework, test-framework-hunit, text
+     , transformers, type-natural, unamb, unordered-containers, vector
      }:
      mkDerivation {
        pname = "computational-algebra";
@@ -45749,12 +46223,18 @@ self: {
          sized tagged template-haskell text type-natural unamb
          unordered-containers vector
        ];
+       executableHaskellDepends = [
+         algebra algebraic-prelude base constraints convertible criterion
+         deepseq equational-reasoning hmatrix lens matrix MonadRandom
+         parallel random reflection semigroups singletons sized type-natural
+         vector
+       ];
        testHaskellDepends = [
          algebra base constraints containers convertible deepseq
-         equational-reasoning hspec HUnit lens matrix MonadRandom
-         monomorphic process QuickCheck quickcheck-instances reflection
-         singletons sized smallcheck tagged test-framework
-         test-framework-hunit text type-natural vector
+         equational-reasoning hspec HUnit lazysmallcheck lens matrix
+         MonadRandom monomorphic process QuickCheck quickcheck-instances
+         reflection singletons sized smallcheck tagged test-framework
+         test-framework-hunit text transformers type-natural vector
        ];
        benchmarkHaskellDepends = [
          algebra base constraints containers criterion deepseq
@@ -45906,25 +46386,34 @@ self: {
      }) {};
 
   "concrete-haskell" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers
-     , directory, filepath, hashable, megaparsec, mtl
-     , optparse-applicative, process, QuickCheck, scientific, tar, text
-     , thrift, time, unordered-containers, uuid, vector, zlib
+    ({ mkDerivation, base, bytestring, bzlib, containers, directory
+     , filepath, hashable, megaparsec, mtl, network, optparse-generic
+     , path-io, process, QuickCheck, scientific, tar, text, thrift, time
+     , unordered-containers, uuid, vector, zip, zlib
      }:
      mkDerivation {
        pname = "concrete-haskell";
-       version = "0.1.0.8";
-       sha256 = "10pr4c48kdgbm365y4jjwk5ba3xvi90p1n8m94161y1j4bs1zzvm";
+       version = "0.1.0.11";
+       sha256 = "12kvwxngsnh3lhp1q415ga8apkadfb8cxzvrlmlvrjdk6p5aczza";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         attoparsec base bytestring containers directory filepath hashable
-         megaparsec mtl process QuickCheck scientific tar text thrift time
-         unordered-containers uuid vector zlib
+         base bytestring bzlib containers directory filepath hashable
+         megaparsec mtl network optparse-generic path-io process QuickCheck
+         scientific tar text thrift time unordered-containers uuid vector
+         zip zlib
        ];
        executableHaskellDepends = [
-         base bytestring containers directory filepath optparse-applicative
-         process text vector zlib
+         base bytestring bzlib containers directory filepath hashable
+         megaparsec mtl network optparse-generic path-io process QuickCheck
+         scientific tar text thrift time unordered-containers uuid vector
+         zip zlib
+       ];
+       testHaskellDepends = [
+         base bytestring bzlib containers directory filepath hashable
+         megaparsec mtl network optparse-generic path-io process QuickCheck
+         scientific tar text thrift time unordered-containers uuid vector
+         zip zlib
        ];
        homepage = "https://github.com/hltcoe";
        description = "Library for the Concrete data format";
@@ -45932,6 +46421,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "concrete-haskell-autogen" = callPackage
+    ({ mkDerivation, base, bytestring, containers, hashable, QuickCheck
+     , text, thrift, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "concrete-haskell-autogen";
+       version = "0.0.0.1";
+       sha256 = "09y6jj0f7kaibn9imnk6wrhkn1yq1dpjxr8pqdizqqm5dwrwy94m";
+       libraryHaskellDepends = [
+         base bytestring containers hashable QuickCheck text thrift
+         unordered-containers vector
+       ];
+       homepage = "https://github.com/hltcoe";
+       description = "Automatically generated Thrift definitions for the Concrete data format";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "concrete-relaxng-parser" = callPackage
     ({ mkDerivation, base, cmdargs, containers, hxt, hxt-charproperties
      , hxt-curl, hxt-relaxng, hxt-tagsoup
@@ -46690,13 +47197,14 @@ self: {
      }:
      mkDerivation {
        pname = "config-ini";
-       version = "0.1.2.0";
-       sha256 = "05gfqyrqnvnn0hy145vf9g7iiyariqj7gqacckdib8zv8msvg8nk";
+       version = "0.1.2.1";
+       sha256 = "14yq2yssk13ip0iz7q7wl3gp9k575wcj3h7c603halkdqf17iibi";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base megaparsec text transformers unordered-containers
        ];
+       executableHaskellDepends = [ base text ];
        testHaskellDepends = [
          base directory doctest ini microlens QuickCheck text
          unordered-containers
@@ -46791,7 +47299,7 @@ self: {
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring
      , case-insensitive, containers, directory, either, functor-infix
      , hspec, hspec-discover, mtl, pretty-show, QuickCheck, safe
-     , scientific, string-conversions, template-haskell
+     , scientific, string-conversions, template-haskell, text
      , unordered-containers, vector, yaml
      }:
      mkDerivation {
@@ -46805,6 +47313,9 @@ self: {
          functor-infix mtl safe string-conversions template-haskell
          unordered-containers vector yaml
        ];
+       executableHaskellDepends = [
+         base bytestring mtl pretty-show string-conversions text yaml
+       ];
        testHaskellDepends = [
          aeson aeson-pretty base case-insensitive hspec hspec-discover mtl
          pretty-show QuickCheck scientific string-conversions
@@ -47268,18 +47779,16 @@ self: {
 
   "consumers" = callPackage
     ({ mkDerivation, base, containers, exceptions, hpqtypes
-     , lifted-base, lifted-threads, log, monad-control, mtl, stm, time
-     , transformers-base
+     , lifted-base, lifted-threads, log-base, monad-control, mtl, stm
+     , time, transformers-base
      }:
      mkDerivation {
        pname = "consumers";
-       version = "2.0";
-       sha256 = "15ar527x015hxbqwf49xfacg1w975zir61kaq5054pyfshgg0yj6";
-       revision = "1";
-       editedCabalFile = "1j4034gsibz22cwh3vqjb0lyvdibn2y3nkmj2bmzwdjw5s110x2z";
+       version = "2.0.0.1";
+       sha256 = "1hpqn3bd4d08is0lczn1cgr9kl0s5rz719p8a2n1qyjriibrh7k1";
        libraryHaskellDepends = [
-         base containers exceptions hpqtypes lifted-base lifted-threads log
-         monad-control mtl stm time transformers-base
+         base containers exceptions hpqtypes lifted-base lifted-threads
+         log-base monad-control mtl stm time transformers-base
        ];
        homepage = "https://github.com/scrive/consumers";
        description = "Concurrent PostgreSQL data consumers";
@@ -47478,8 +47987,10 @@ self: {
      }) {};
 
   "continuum" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, containers, hyperleveldb
-     , mtl, nanomsg-haskell, time
+    ({ mkDerivation, base, bytestring, cereal, containers, data-default
+     , foldl, hyperleveldb, leveldb-haskell-fork, mtl, nanomsg-haskell
+     , parallel-io, resourcet, stm, suspend, time, timers, transformers
+     , transformers-base
      }:
      mkDerivation {
        pname = "continuum";
@@ -47490,6 +48001,11 @@ self: {
        libraryHaskellDepends = [
          base bytestring cereal containers mtl nanomsg-haskell time
        ];
+       executableHaskellDepends = [
+         base bytestring cereal containers data-default foldl
+         leveldb-haskell-fork mtl nanomsg-haskell parallel-io resourcet stm
+         suspend time timers transformers transformers-base
+       ];
        executableSystemDepends = [ hyperleveldb ];
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -48118,6 +48634,7 @@ self: {
        ];
        description = "A compiler for CoPilot targeting SBV";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "copilot-theorem" = callPackage
@@ -48439,16 +48956,16 @@ self: {
      }) {};
 
   "country" = callPackage
-    ({ mkDerivation, base, bytestring, ghc-prim, hashable, primitive
-     , text, unordered-containers
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, ghc-prim
+     , hashable, primitive, scientific, text, unordered-containers
      }:
      mkDerivation {
        pname = "country";
-       version = "0.1.1";
-       sha256 = "00fmbljb9s1nfhgcv52ka9mavfqp6ljx6nzw5jmy8f1j8rvx49l6";
+       version = "0.1.3";
+       sha256 = "0gn73gkfqn4iy9zjbkzf5x65pljg82hm6dvi7fb81hxswwm50qbs";
        libraryHaskellDepends = [
-         base bytestring ghc-prim hashable primitive text
-         unordered-containers
+         aeson attoparsec base bytestring ghc-prim hashable primitive
+         scientific text unordered-containers
        ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/andrewthad/country#readme";
@@ -48457,7 +48974,9 @@ self: {
      }) {};
 
   "country-codes" = callPackage
-    ({ mkDerivation, aeson, base, HTF, HUnit, shakespeare, text }:
+    ({ mkDerivation, aeson, base, HTF, HUnit, shakespeare, tagsoup
+     , text
+     }:
      mkDerivation {
        pname = "country-codes";
        version = "0.1.3";
@@ -48465,6 +48984,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ aeson base shakespeare text ];
+       executableHaskellDepends = [ base tagsoup text ];
        testHaskellDepends = [ aeson base HTF HUnit ];
        homepage = "https://github.com/prowdsponsor/country-codes";
        description = "ISO 3166 country codes and i18n names";
@@ -49070,13 +49590,16 @@ self: {
      }:
      mkDerivation {
        pname = "crawlchain";
-       version = "0.1.2.0";
-       sha256 = "17rvn7yxcaz7zya358rnvw9imf0b660s4hnk8ds81c8pvshc65hh";
+       version = "0.2.0.0";
+       sha256 = "0fs8996lzwibnqcaq3j5zgw7alnq8y1k3xqylpdgcp06p7na744q";
        libraryHaskellDepends = [
          base bytestring directory http-streams network-uri split tagsoup
          text time
        ];
-       testHaskellDepends = [ base split tagsoup ];
+       testHaskellDepends = [
+         base bytestring directory http-streams network-uri split tagsoup
+         text time
+       ];
        description = "Simulation user crawl paths";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -49531,6 +50054,7 @@ self: {
        homepage = "https://github.com/amarpotghan/crjdt-haskell#readme";
        description = "A Conflict-Free Replicated JSON Datatype for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "crockford" = callPackage
@@ -50078,6 +50602,7 @@ self: {
        homepage = "https://github.com/libscott/cryptoconditions-hs";
        description = "Interledger Crypto-Conditions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cryptohash" = callPackage
@@ -50255,6 +50780,43 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cryptol_2_5_0" = callPackage
+    ({ mkDerivation, alex, ansi-terminal, array, async, base
+     , base-compat, bytestring, containers, criterion, deepseq
+     , directory, filepath, gitrev, GraphSCC, happy, haskeline, heredoc
+     , monad-control, monadLib, mtl, old-time, presburger, pretty
+     , process, QuickCheck, random, sbv, simple-smt, smtLib, syb
+     , template-haskell, text, tf-random, time, transformers
+     , transformers-base, utf8-string
+     }:
+     mkDerivation {
+       pname = "cryptol";
+       version = "2.5.0";
+       sha256 = "1w8w4srdvnd8dwjbip45bdqsgpg5xmw2nrw1asnk857bgdhjh2ci";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array async base base-compat bytestring containers deepseq
+         directory filepath gitrev GraphSCC heredoc monad-control monadLib
+         mtl old-time presburger pretty process QuickCheck random sbv
+         simple-smt smtLib syb template-haskell text tf-random time
+         transformers transformers-base utf8-string
+       ];
+       libraryToolDepends = [ alex happy ];
+       executableHaskellDepends = [
+         ansi-terminal base base-compat containers deepseq directory
+         filepath haskeline monad-control monadLib process random sbv
+         tf-random transformers
+       ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq directory filepath sbv text
+       ];
+       homepage = "http://www.cryptol.net/";
+       description = "Cryptol: The Language of Cryptography";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cryptonite" = callPackage
     ({ mkDerivation, base, byteable, bytestring, deepseq, ghc-prim
      , integer-gmp, memory, tasty, tasty-hunit, tasty-kat
@@ -50412,8 +50974,8 @@ self: {
      }:
      mkDerivation {
        pname = "csound-catalog";
-       version = "0.7.0";
-       sha256 = "1fxmfwc8ksyzjxjj64zbzgqgs0kk74a6rx6xqlyqg331drdrh00y";
+       version = "0.7.1";
+       sha256 = "117ih5cssflaa7mvg4a4vz5sfsylivb8n0ri90211pml3d5idwpf";
        libraryHaskellDepends = [
          base csound-expression csound-sampler sharc-timbre transformers
        ];
@@ -50431,8 +50993,8 @@ self: {
      }:
      mkDerivation {
        pname = "csound-expression";
-       version = "5.2.1";
-       sha256 = "1an6m2090xjrraibmbxagbwlakmg83d1d0wasr7njv3cihms2dbq";
+       version = "5.2.2";
+       sha256 = "05vlyd3b2kkpspp6jmxrwhv0474rw6ij6ha7jajrbqyx42a4g8bl";
        libraryHaskellDepends = [
          base Boolean colour containers csound-expression-dynamic
          csound-expression-opcodes csound-expression-typed data-default
@@ -50449,8 +51011,8 @@ self: {
      }:
      mkDerivation {
        pname = "csound-expression-dynamic";
-       version = "0.3.0";
-       sha256 = "1x16h3zfxmmbkjc6l2w4q5j5q4v9b7x7p9dn8b8f113z73zc8djq";
+       version = "0.3.2";
+       sha256 = "1h827ijkwa5fyg1jphaa19fr4wxs5l76m89xl44989jnb7blbkcd";
        libraryHaskellDepends = [
          array base Boolean containers data-default data-fix data-fix-cse
          hashable transformers wl-pprint
@@ -50477,17 +51039,18 @@ self: {
 
   "csound-expression-typed" = callPackage
     ({ mkDerivation, base, Boolean, colour, containers
-     , csound-expression-dynamic, data-default, deepseq, ghc-prim
-     , hashable, NumInstances, temporal-media, transformers, wl-pprint
+     , csound-expression-dynamic, data-default, deepseq, directory
+     , filepath, ghc-prim, hashable, NumInstances, temporal-media
+     , transformers, wl-pprint
      }:
      mkDerivation {
        pname = "csound-expression-typed";
-       version = "0.2.0.1";
-       sha256 = "1hihdgar789kbdb17a63h9cwsy4xz8mqlxq3919zj6cny87xl1af";
+       version = "0.2.0.2";
+       sha256 = "1fb3wayix991awxnns6y1a9kmb6kvnay7p4rx62nvj89qa513d82";
        libraryHaskellDepends = [
          base Boolean colour containers csound-expression-dynamic
-         data-default deepseq ghc-prim hashable NumInstances temporal-media
-         transformers wl-pprint
+         data-default deepseq directory filepath ghc-prim hashable
+         NumInstances temporal-media transformers wl-pprint
        ];
        homepage = "https://github.com/anton-k/csound-expression-typed";
        description = "typed core for the library csound-expression";
@@ -50498,8 +51061,8 @@ self: {
     ({ mkDerivation, base, csound-expression, transformers }:
      mkDerivation {
        pname = "csound-sampler";
-       version = "0.0.8.0";
-       sha256 = "18igbiwn8rc6q5w2fddhqp2m823fagcx6d2d5ma05l8milci2j1r";
+       version = "0.0.8.1";
+       sha256 = "15k5in43w4ivkzi6qs5z19fh3pd2fg5ih1dyd1vk736lawlivx20";
        libraryHaskellDepends = [ base csound-expression transformers ];
        homepage = "https://github.com/anton-k/csound-sampler";
        description = "A musical sampler based on Csound";
@@ -50624,6 +51187,10 @@ self: {
          mtl primitive resourcet text transformers unordered-containers
          vector
        ];
+       executableHaskellDepends = [
+         base bytestring containers directory mtl primitive text
+         transformers vector
+       ];
        testHaskellDepends = [
          base bytestring containers directory HUnit mtl primitive
          test-framework test-framework-hunit text transformers vector
@@ -50776,6 +51343,9 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring cereal containers STL ];
+       executableHaskellDepends = [
+         base bytestring cereal containers hspec STL
+       ];
        testHaskellDepends = [
          base bytestring cereal containers hspec STL
        ];
@@ -53188,6 +53758,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
+       executableHaskellDepends = [ base ];
        homepage = "http://ku-fpg.github.io/software/data-reify/";
        description = "Reify a recursive data structure into an explicit graph";
        license = stdenv.lib.licenses.bsd3;
@@ -54657,6 +55228,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "decimal-literals" = callPackage
+    ({ mkDerivation, base, tasty, tasty-hunit }:
+     mkDerivation {
+       pname = "decimal-literals";
+       version = "0.1.0.0";
+       sha256 = "0zsykb1ydihcd6x7v5xx1i0v5wn6a48g7ndzi68iwhivmj0qxyi7";
+       revision = "1";
+       editedCabalFile = "14qc6k8bjsixk5bzqwir1lbs1kqnl0a1py7779a63civv2ph5g5v";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
+       homepage = "https://github.com/leftaroundabout/decimal-literals";
+       description = "Preprocessing decimal literals more or less as they are (instead of via fractions)";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "declarative" = callPackage
     ({ mkDerivation, base, hasty-hamiltonian, kan-extensions, lens
      , mcmc-types, mighty-metropolis, mwc-probability, pipes, primitive
@@ -54787,17 +55374,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "deepseq_1_4_2_0" = callPackage
-    ({ mkDerivation, array, base, HUnit, test-framework
+  "deepseq_1_4_3_0" = callPackage
+    ({ mkDerivation, array, base, ghc-prim, HUnit, test-framework
      , test-framework-hunit
      }:
      mkDerivation {
        pname = "deepseq";
-       version = "1.4.2.0";
-       sha256 = "0la9x4hvf1rbmxv8h9dk1qln21il3wydz6wbdviryh4h2wls22ny";
+       version = "1.4.3.0";
+       sha256 = "0fjdmsd8fqqv78m7111m10pdfswnxmn02zx1fsv2k26b5jckb0bd";
        libraryHaskellDepends = [ array base ];
        testHaskellDepends = [
-         array base HUnit test-framework test-framework-hunit
+         array base ghc-prim HUnit test-framework test-framework-hunit
        ];
        description = "Deep evaluation of data structures";
        license = stdenv.lib.licenses.bsd3;
@@ -55538,8 +56125,8 @@ self: {
     ({ mkDerivation, base, hspec, QuickCheck }:
      mkDerivation {
        pname = "derive-storable";
-       version = "0.1.0.6";
-       sha256 = "04mhv66rjbr4dg9din9frhwgv5cx5jxs0v4z2p9m36lmw0lhyak9";
+       version = "0.1.1.0";
+       sha256 = "0yh998p0n89ma3698qiiw42yrchn2jp5h3jfjpsw0vs9jqh144l1";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "https://www.github.com/mkloczko/derive-storable/";
@@ -55840,27 +56427,25 @@ self: {
 
   "dhall" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, case-insensitive
-     , charset, containers, http-client, http-client-tls, lens
-     , neat-interpolation, optparse-generic, parsers, system-fileio
-     , system-filepath, tasty, tasty-hunit, text, text-format
-     , transformers, trifecta, unordered-containers, vector
+     , charset, containers, contravariant, http-client, http-client-tls
+     , lens, optparse-generic, parsers, system-fileio, system-filepath
+     , tasty, tasty-hunit, text, text-format, transformers, trifecta
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "dhall";
-       version = "1.4.2";
-       sha256 = "0wnfqm0478h9fqav13q6fqnj8fzbhigsndnasr0hbcjd3s3qvf0d";
+       version = "1.5.0";
+       sha256 = "13s98jjhibm9p0hd9y9fbj0a1il4mwcp2v9mi9j0zrpn6vr4h00p";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          ansi-wl-pprint base bytestring case-insensitive charset containers
-         http-client http-client-tls lens neat-interpolation parsers
+         contravariant http-client http-client-tls lens parsers
          system-fileio system-filepath text text-format transformers
          trifecta unordered-containers vector
        ];
        executableHaskellDepends = [ base optparse-generic text trifecta ];
-       testHaskellDepends = [
-         base neat-interpolation tasty tasty-hunit text vector
-       ];
+       testHaskellDepends = [ base tasty tasty-hunit text vector ];
        description = "A configuration language guaranteed to terminate";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -55872,8 +56457,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall-bash";
-       version = "1.0.2";
-       sha256 = "19nzf0wh7z3xjpkn48dmi66hqayjscwi3r2w0nkxpkwrcfagrkw2";
+       version = "1.0.3";
+       sha256 = "0hh0fvsvfqgq42yzmgr5ipyhf18iqqk54265pzsrfmanpbfwrycr";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -55912,8 +56497,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall-json";
-       version = "1.0.3";
-       sha256 = "1q3b3vcvkpz5b79xcdh66p0vqqvjlnd52pvdanlf7vp819n2zsdy";
+       version = "1.0.4";
+       sha256 = "0kwr1sj9llkgj68b59ih2lp9p0mav31yk7wfk5m8cq4xp33qrl30";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -55932,8 +56517,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall-nix";
-       version = "1.0.4";
-       sha256 = "19sv7n3fn7vkrclmcbjn141ypxi4ja78ahlndnmci6vbv40hm2vf";
+       version = "1.0.5";
+       sha256 = "0cg85n90fjayxqmgxvb54i8xz6c3x4dp6sgnq4gw3al6fnja8vl5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -55950,8 +56535,8 @@ self: {
     ({ mkDerivation, base, dhall, optparse-generic, text }:
      mkDerivation {
        pname = "dhall-text";
-       version = "1.0.0";
-       sha256 = "1xbgzvmxd9y1f58nh9a495rqn3s7yfq93l61by5g9sd81vvbcgqd";
+       version = "1.0.1";
+       sha256 = "0w95diizcwdiass71gv61aim98vvy4648f038sk9sklxw95f0jfz";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base dhall optparse-generic text ];
@@ -56065,8 +56650,8 @@ self: {
        pname = "diagrams-builder";
        version = "0.8.0.1";
        sha256 = "072vzskwp20qb768rv87876ngn6gnj959m91vpzri9ls9jx0x6vf";
-       revision = "1";
-       editedCabalFile = "0r5w2n2y8w3ijzy5s603i8rcj8vl1ggzivw2nj2zbrginma27npc";
+       revision = "2";
+       editedCabalFile = "0hrpic80rh8xyld8fhblvwykkg82nlp7j9xmcf5403wnqgprna97";
        configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ];
        isLibrary = true;
        isExecutable = true;
@@ -56979,8 +57564,8 @@ self: {
      }:
      mkDerivation {
        pname = "digestive-functors-aeson";
-       version = "1.1.21";
-       sha256 = "0y2f60yyaj79a8y2bw1g6i6k0i9prj5ghk5q8ljqf3yjkgvlqa8z";
+       version = "1.1.22";
+       sha256 = "1gsvv8kgjjjq7nlpixq3gz6d1j90l83pmh2r3h18019369fcv3ip";
        libraryHaskellDepends = [
          aeson base containers digestive-functors lens lens-aeson safe text
          vector
@@ -57065,8 +57650,8 @@ self: {
     ({ mkDerivation, base, digestive-functors, lucid, text }:
      mkDerivation {
        pname = "digestive-functors-lucid";
-       version = "0.0.0.4";
-       sha256 = "1q5h0zfz9x8zb08ayrxn0hd5cijrcqfgfihzg82vqiiaqygz9bi1";
+       version = "0.0.0.5";
+       sha256 = "176vc7gsm0379100imk1i8y8r2gx0l66dijgmxkqbq1qwkjfizs5";
        libraryHaskellDepends = [ base digestive-functors lucid text ];
        homepage = "https://github.com/athanclark/digestive-functors-lucid";
        description = "Lucid frontend for the digestive-functors library";
@@ -57233,6 +57818,7 @@ self: {
        homepage = "https://github.com/achirkin/easytensor#readme";
        description = "Safe type-level dimensionality for multidimensional data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dingo-core" = callPackage
@@ -58196,6 +58782,7 @@ self: {
          base binary bytestring containers distributed-process mtl network
          network-transport network-transport-tcp
        ];
+       executableHaskellDepends = [ base distributed-process mtl ];
        homepage = "https://bitbucket.org/dpwiz/distributed-process-p2p/";
        description = "Peer-to-peer node discovery for Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -58424,6 +59011,7 @@ self: {
          base binary bytestring containers deepseq distributed-process hzk
          mtl network network-transport network-transport-tcp transformers
        ];
+       executableHaskellDepends = [ base distributed-process ];
        testHaskellDepends = [
          base bytestring deepseq distributed-process
          distributed-process-monad-control enclosed-exceptions hspec hzk
@@ -59108,6 +59696,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "doctest_0_12_0" = callPackage
+    ({ mkDerivation, base, base-compat, code-page, deepseq, directory
+     , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process
+     , QuickCheck, setenv, silently, stringbuilder, syb, transformers
+     , with-location
+     }:
+     mkDerivation {
+       pname = "doctest";
+       version = "0.12.0";
+       sha256 = "13h549cpgcvb7c54c7wif28g5wak84dxc3ais0hlqhzk1q6la91a";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base-compat code-page deepseq directory filepath ghc ghc-paths
+         process syb transformers
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base base-compat code-page deepseq directory filepath ghc ghc-paths
+         hspec HUnit mockery process QuickCheck setenv silently
+         stringbuilder syb transformers with-location
+       ];
+       homepage = "https://github.com/sol/doctest#readme";
+       description = "Test interactive Haskell examples";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "doctest-discover" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, doctest
      , filepath
@@ -59456,6 +60072,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/ku-fpg/dotgen";
        description = "A simple interface for building .dot graph files.";
        license = stdenv.lib.licenses.bsd3;
@@ -60280,8 +60897,8 @@ self: {
      }:
      mkDerivation {
        pname = "duckling";
-       version = "0.1.1.0";
-       sha256 = "0c81cjah5iy3p2p9g4z1k0mxwg1256l93m53bnk7pr37439vwnx6";
+       version = "0.1.2.0";
+       sha256 = "1sqkygqx28srbpvnq05fyzqs9c9ixsfdfgivvzqr8yqkwvbxajxr";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -60290,9 +60907,9 @@ self: {
          time timezone-series unordered-containers
        ];
        executableHaskellDepends = [
-         aeson base bytestring directory extra filepath haskell-src-exts
-         snap-core snap-server text text-show time timezone-olson
-         timezone-series unordered-containers
+         aeson base bytestring dependent-sum directory extra filepath
+         haskell-src-exts snap-core snap-server text text-show time
+         timezone-olson timezone-series unordered-containers
        ];
        testHaskellDepends = [
          aeson base tasty tasty-hunit text time unordered-containers
@@ -60302,6 +60919,26 @@ self: {
        license = "unknown";
      }) {};
 
+  "dumb-cas" = callPackage
+    ({ mkDerivation, base, containers, decimal-literals, hashable
+     , tasty, tasty-hunit, template-haskell, unordered-containers
+     }:
+     mkDerivation {
+       pname = "dumb-cas";
+       version = "0.1.0.0";
+       sha256 = "0jrxphgxm6f7wzrn8vzfz0i6scz2xz72yja5i2bmkf185gqvhpjz";
+       revision = "1";
+       editedCabalFile = "0wzq73i209fa8apj34lc851cgg6047kimxkl9ykv8l9nspg22faq";
+       libraryHaskellDepends = [
+         base containers decimal-literals hashable template-haskell
+         unordered-containers
+       ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
+       description = "A computer “algebra” system that knows nothing about algebra, at the core";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dump" = callPackage
     ({ mkDerivation, base, haskell-src-meta, hspec
      , interpolatedstring-perl6, QuickCheck, template-haskell, text
@@ -60779,13 +61416,15 @@ self: {
      }) {};
 
   "dynobud" = callPackage
-    ({ mkDerivation, aeson, base, binary, casadi-bindings
-     , casadi-bindings-core, cereal, containers, data-default-class
-     , directory, distributive, doctest, generic-accessors, hmatrix
-     , hmatrix-gsl, HUnit, jacobi-roots, lens, linear, mtl, mwc-random
-     , Plot-ho-matic, process, QuickCheck, reflection, spatial-math
+    ({ mkDerivation, aeson, base, binary, bytestring, casadi-bindings
+     , casadi-bindings-core, cereal, Chart, Chart-gtk, cmdargs, colour
+     , containers, data-default-class, directory, distributive, doctest
+     , generic-accessors, hmatrix, hmatrix-gsl, HUnit, jacobi-roots
+     , lens, linear, mtl, mwc-random, not-gloss, Plot-ho-matic, process
+     , QuickCheck, reflection, semigroups, spatial-math, stm
      , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , time, vector, vector-binary-instances
+     , time, unordered-containers, vector, vector-binary-instances
+     , zeromq4-haskell
      }:
      mkDerivation {
        pname = "dynobud";
@@ -60800,6 +61439,12 @@ self: {
          mwc-random Plot-ho-matic process reflection spatial-math time
          vector vector-binary-instances
        ];
+       executableHaskellDepends = [
+         base bytestring casadi-bindings casadi-bindings-core cereal Chart
+         Chart-gtk cmdargs colour containers data-default-class
+         generic-accessors lens linear mtl not-gloss Plot-ho-matic
+         semigroups stm time unordered-containers vector zeromq4-haskell
+       ];
        testHaskellDepends = [
          base binary casadi-bindings cereal containers doctest hmatrix
          hmatrix-gsl HUnit linear QuickCheck test-framework
@@ -61016,7 +61661,7 @@ self: {
        homepage = "https://github.com/achirkin/easytensor#readme";
        description = "Pure, type-indexed haskell vector, matrix, and tensor library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ebeats" = callPackage
@@ -61133,6 +61778,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base process ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/RyanGlScott/echo";
        description = "A cross-platform, cross-console way to handle echoing terminal input";
        license = stdenv.lib.licenses.bsd3;
@@ -61665,7 +62311,7 @@ self: {
 
   "ehs" = callPackage
     ({ mkDerivation, base, bytestring, haskell-src-meta, parsec
-     , template-haskell, text, transformers
+     , template-haskell, text, time, transformers
      }:
      mkDerivation {
        pname = "ehs";
@@ -61679,6 +62325,7 @@ self: {
          base bytestring haskell-src-meta parsec template-haskell text
          transformers
        ];
+       executableHaskellDepends = [ base bytestring text time ];
        homepage = "http://github.com/minpou/ehs/";
        description = "Embedded haskell template using quasiquotes";
        license = stdenv.lib.licenses.mit;
@@ -61793,8 +62440,8 @@ self: {
      }:
      mkDerivation {
        pname = "ekg-bosun";
-       version = "1.0.8";
-       sha256 = "0y0vfxlzsblb5vppxi5bda9z32y485rlhqsr6h78ww1f8ppb84la";
+       version = "1.0.9";
+       sha256 = "04j65wxdwbyfay0a40kfx0lnzph3k32jidaqks48g2nxjxqn8gvh";
        libraryHaskellDepends = [
          aeson base ekg-core http-client lens network network-uri old-locale
          text time unordered-containers vector wreq
@@ -61810,8 +62457,8 @@ self: {
      }:
      mkDerivation {
        pname = "ekg-carbon";
-       version = "1.0.7";
-       sha256 = "18shnh4synsnr2xl0ycnafg52k8zwkwa989g2l0sc1b3zb33vijd";
+       version = "1.0.8";
+       sha256 = "0n65c6yv43gckxlckl9bmmf0ags3pp055lvxpi5rbq1d95b29xqd";
        libraryHaskellDepends = [
          base ekg-core network network-carbon text time unordered-containers
          vector
@@ -61975,6 +62622,7 @@ self: {
        libraryHaskellDepends = [
          base bytestring ekg-core text time unordered-containers
        ];
+       executableHaskellDepends = [ base ekg-core ];
        homepage = "https://github.com/adarqui/ekg-push";
        description = "Small framework to push metric deltas to a broadcast channel using the ekg-core library";
        license = stdenv.lib.licenses.bsd3;
@@ -62128,16 +62776,21 @@ self: {
      }) {};
 
   "eliminators" = callPackage
-    ({ mkDerivation, base, hspec, singletons }:
+    ({ mkDerivation, base, extra, hspec, singletons, template-haskell
+     , th-abstraction, th-desugar
+     }:
      mkDerivation {
        pname = "eliminators";
-       version = "0.1";
-       sha256 = "0amd3gwnxhdbpg9afv2zs4c3lhc9s7ri66cpdp4x7vmp5xx6yi3n";
-       libraryHaskellDepends = [ base singletons ];
+       version = "0.2";
+       sha256 = "1flv7bmsx38wgb88kdvwncn55fkahfsi2gghc5jwy0j9036pr3h9";
+       libraryHaskellDepends = [
+         base extra singletons template-haskell th-abstraction th-desugar
+       ];
        testHaskellDepends = [ base hspec singletons ];
        homepage = "https://github.com/RyanGlScott/eliminators";
        description = "Dependently typed elimination functions using singletons";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "elision" = callPackage
@@ -62949,6 +63602,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "engine-io_1_2_17" = callPackage
+    ({ mkDerivation, aeson, async, attoparsec, base, base64-bytestring
+     , bytestring, either, free, monad-loops, mwc-random, stm, stm-delay
+     , text, transformers, unordered-containers, vector, websockets
+     }:
+     mkDerivation {
+       pname = "engine-io";
+       version = "1.2.17";
+       sha256 = "0m5nr1qk15p332dhmiyrpfdm91cf3al2nah6rja55y6gpc2vvvbv";
+       libraryHaskellDepends = [
+         aeson async attoparsec base base64-bytestring bytestring either
+         free monad-loops mwc-random stm stm-delay text transformers
+         unordered-containers vector websockets
+       ];
+       homepage = "http://github.com/ocharles/engine.io";
+       description = "A Haskell implementation of Engine.IO";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "engine-io-growler" = callPackage
     ({ mkDerivation, base, bytestring, engine-io, growler, http-types
      , mtl, pipes, pipes-attoparsec, pipes-wai, socket-io, text
@@ -62976,8 +63649,8 @@ self: {
      }:
      mkDerivation {
        pname = "engine-io-snap";
-       version = "1.0.4";
-       sha256 = "1w3r8w1rwik3v5m8lrfll6izymf0c49sralhaxn1kcgc1bq26wv8";
+       version = "1.0.5";
+       sha256 = "03pbdc2pbhrabnbnxcrwlby3z84p7fn9k4h1l3pbx6969m6qn7xa";
        libraryHaskellDepends = [
          base bytestring containers engine-io io-streams lifted-base
          snap-core unordered-containers websockets websockets-snap
@@ -64967,7 +65640,9 @@ self: {
      }) {};
 
   "exact-cover" = callPackage
-    ({ mkDerivation, base, containers, tasty, tasty-hunit }:
+    ({ mkDerivation, base, boxes, containers, safe, tasty, tasty-hunit
+     , vector
+     }:
      mkDerivation {
        pname = "exact-cover";
        version = "0.1.0.0";
@@ -64975,6 +65650,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
+       executableHaskellDepends = [ base boxes containers safe vector ];
        testHaskellDepends = [ base containers tasty tasty-hunit ];
        homepage = "https://github.com/arthurl/exact-cover";
        description = "Efficient exact cover solver";
@@ -65014,6 +65690,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "exact-real-positional" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "exact-real-positional";
+       version = "0.0.0";
+       sha256 = "0qh1aqyi2k7djwqykj888hxjisip9ahg2ap43cj0xmdvfh9p0351";
+       libraryHaskellDepends = [ base ];
+       description = "Framework for Exact Real Arithmetic in the Positional Number System";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "exception-hierarchy" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -65239,6 +65926,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "exhaustive_1_1_5" = callPackage
+    ({ mkDerivation, base, generics-sop, template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "exhaustive";
+       version = "1.1.5";
+       sha256 = "1qkv6ibdp0a7hi57dhxy3yfbwbs1asmjvqs5nh1p34awz7npvrh9";
+       libraryHaskellDepends = [
+         base generics-sop template-haskell transformers
+       ];
+       homepage = "http://github.com/ocharles/exhaustive";
+       description = "Compile time checks that a computation considers producing data through all possible constructors";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "exherbo-cabal" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, Cabal
      , containers, data-default, deepseq, directory, doctest, filepath
@@ -66307,6 +67010,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fast-mult" = callPackage
+    ({ mkDerivation, base, ghc-prim, integer-gmp, strict-base }:
+     mkDerivation {
+       pname = "fast-mult";
+       version = "0.1.0.0";
+       sha256 = "19ra4sl10qawn2ig97ls0ib2sfy2b891gkjl4k7nia5lqp69smjh";
+       libraryHaskellDepends = [ base ghc-prim integer-gmp strict-base ];
+       homepage = "https://github.com/clintonmead/fast-mult#readme";
+       description = "Numeric type with asymptotically faster multiplications";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "fast-nats" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -67372,7 +68087,7 @@ self: {
   "ffmpeg-light" = callPackage
     ({ mkDerivation, base, bytestring, either, exceptions, ffmpeg
      , JuicyPixels, libavcodec, libavdevice, libavformat, libswscale
-     , mtl, transformers, vector
+     , monad-loops, mtl, text, transformers, vector
      }:
      mkDerivation {
        pname = "ffmpeg-light";
@@ -67387,6 +68102,10 @@ self: {
        libraryPkgconfigDepends = [
          ffmpeg libavcodec libavdevice libavformat libswscale
        ];
+       executableHaskellDepends = [
+         base bytestring JuicyPixels monad-loops mtl text transformers
+         vector
+       ];
        homepage = "http://github.com/acowley/ffmpeg-light";
        description = "Minimal bindings to the FFmpeg library";
        license = stdenv.lib.licenses.bsd3;
@@ -68282,6 +69001,7 @@ self: {
        homepage = "https://github.com/rudymatela/fitspec#readme";
        description = "refining property sets for testing Haskell programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fix-imports" = callPackage
@@ -69521,6 +70241,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fold-debounce_0_2_0_6" = callPackage
+    ({ mkDerivation, base, data-default-class, hspec, stm, stm-delay
+     , time
+     }:
+     mkDerivation {
+       pname = "fold-debounce";
+       version = "0.2.0.6";
+       sha256 = "133q81c6gvk6zgn3zv5wkvp5sa6b5fvzf9i4facs9s00l7y2nrgk";
+       libraryHaskellDepends = [
+         base data-default-class stm stm-delay time
+       ];
+       testHaskellDepends = [ base hspec stm time ];
+       homepage = "https://github.com/debug-ito/fold-debounce";
+       description = "Fold multiple events that happen in a given period of time";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fold-debounce-conduit" = callPackage
     ({ mkDerivation, base, conduit, fold-debounce, hspec, resourcet
      , stm, transformers, transformers-base
@@ -70234,15 +70972,15 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
-  "fortran-src_0_1_0_6" = callPackage
+  "fortran-src_0_2_0_0" = callPackage
     ({ mkDerivation, alex, array, base, binary, bytestring, containers
      , directory, fgl, filepath, GenericPretty, happy, hspec, mtl
      , pretty, text, uniplate
      }:
      mkDerivation {
        pname = "fortran-src";
-       version = "0.1.0.6";
-       sha256 = "1rmjcbhfh0j67ffrqg0qp4qsz7bv49k3iw40qy0kmwiivhkgbaxl";
+       version = "0.2.0.0";
+       sha256 = "0mmzr58rbanmml2mfawgg58s7v9v7gkw9maxpy96vyfkk4wjvnwc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -70690,8 +71428,8 @@ self: {
      }:
      mkDerivation {
        pname = "free-functors";
-       version = "0.7.2";
-       sha256 = "08c1i6rm007382py0lkiivkaz4cd7s1mh7d0bh11nzp9ci0q76ny";
+       version = "0.8";
+       sha256 = "179q79l9pax6wqj5dn6i68fwskaf4kbrndpbnhp8d7ba5i3wywfy";
        libraryHaskellDepends = [
          algebraic-classes base bifunctors comonad constraints contravariant
          profunctors template-haskell transformers
@@ -71041,7 +71779,7 @@ self: {
      }) {};
 
   "freetype2" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, array, base }:
      mkDerivation {
        pname = "freetype2";
        version = "0.1.2";
@@ -71049,6 +71787,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ array base ];
        description = "Haskell binding for FreeType 2 library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -71183,6 +71922,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "friendly-time_0_4_1" = callPackage
+    ({ mkDerivation, base, hspec, old-locale, time }:
+     mkDerivation {
+       pname = "friendly-time";
+       version = "0.4.1";
+       sha256 = "1j4k8fjmb10zmj9pvn42mgirv9bpbk0w7n0ys7sp3wn34wr49wws";
+       revision = "1";
+       editedCabalFile = "096nfaqxavi6xblqh4q5dxks824liz75b4rm2la2hlkkn5mhqdgs";
+       libraryHaskellDepends = [ base old-locale time ];
+       testHaskellDepends = [ base hspec old-locale time ];
+       description = "Print time information in friendly ways";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "frisby" = callPackage
     ({ mkDerivation, array, base, containers, mtl }:
      mkDerivation {
@@ -73920,9 +74674,9 @@ self: {
   "gf" = callPackage
     ({ mkDerivation, alex, array, base, bytestring, Cabal, cgi
      , containers, directory, exceptions, filepath, happy, haskeline
-     , HTF, httpd-shed, HUnit, json, mtl, network, network-uri
-     , old-locale, parallel, pretty, process, random, terminfo, time
-     , time-compat, unix, utf8-string
+     , HTF, httpd-shed, HUnit, json, lifted-base, mtl, network
+     , network-uri, old-locale, parallel, pretty, process, random
+     , terminfo, time, time-compat, unix, utf8-string
      }:
      mkDerivation {
        pname = "gf";
@@ -73937,7 +74691,7 @@ self: {
          utf8-string
        ];
        libraryToolDepends = [ alex happy ];
-       executableHaskellDepends = [ base ];
+       executableHaskellDepends = [ base containers lifted-base mtl ];
        testHaskellDepends = [
          base Cabal directory filepath HTF HUnit process
        ];
@@ -73987,14 +74741,38 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ghc-boot_8_0_2" = callPackage
+  "ghc_8_2_1" = callPackage
+    ({ mkDerivation, alex, array, base, binary, bytestring, containers
+     , deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghci, happy
+     , hoopl, hpc, process, template-haskell, terminfo, time
+     , transformers, unix
+     }:
+     mkDerivation {
+       pname = "ghc";
+       version = "8.2.1";
+       sha256 = "0b87bj9n2zsi0v9s5ssf5b9c4y4lji7jbxp9j8s93hb95zlmzq17";
+       libraryHaskellDepends = [
+         array base binary bytestring containers deepseq directory filepath
+         ghc-boot ghc-boot-th ghci hoopl hpc process template-haskell
+         terminfo time transformers unix
+       ];
+       libraryToolDepends = [ alex happy ];
+       homepage = "http://www.haskell.org/ghc/";
+       description = "The GHC API";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "ghc-boot_8_2_1" = callPackage
     ({ mkDerivation, base, binary, bytestring, directory, filepath
      , ghc-boot-th
      }:
      mkDerivation {
        pname = "ghc-boot";
-       version = "8.0.2";
-       sha256 = "0q446bcz38rql96k42yvfyhdg98lycijva1smw2izwv04hx200zp";
+       version = "8.2.1";
+       sha256 = "1v9cdbhxsx7pbig4c3gq5gdp46fwq0blq6zn89x4fpq1vl1kcr6h";
+       revision = "1";
+       editedCabalFile = "0826xd0ccr77v7zqjml266g067qj2bd3mb7d7d8mipqv42j7cy8y";
        libraryHaskellDepends = [
          base binary bytestring directory filepath ghc-boot-th
        ];
@@ -74003,18 +74781,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ghc-boot-th_8_0_2" = callPackage
+  "ghc-boot-th_8_2_1" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "ghc-boot-th";
-       version = "8.0.2";
-       sha256 = "1w7qkgwpbp5h0hm8p2b5bbysyvnjrqbkqkfzd4ngz0yxy9qy402x";
+       version = "8.2.1";
+       sha256 = "18gmrfxyqqv0gchpn35bqsk66if1q8yy4amajdz2kh9v8jz4yfz4";
        libraryHaskellDepends = [ base ];
        description = "Shared functionality between GHC and the @template-haskell@ library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ghc-compact" = callPackage
+    ({ mkDerivation, base, bytestring, ghc-prim }:
+     mkDerivation {
+       pname = "ghc-compact";
+       version = "0.1.0.0";
+       sha256 = "03sf8ap1ncjsibp9z7k9xgcsj9s0q3q6l4shf8k7p8dkwpjl1g2h";
+       libraryHaskellDepends = [ base bytestring ghc-prim ];
+       description = "In memory storage of deeply evaluated data structure";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-core" = callPackage
     ({ mkDerivation, base, colorize-haskell, directory, filepath
      , pcre-light, process
@@ -74137,7 +74927,7 @@ self: {
          array base binary bytestring containers
        ];
        executableHaskellDepends = [ base containers ];
-       testHaskellDepends = [ base ];
+       testHaskellDepends = [ base bytestring ];
        description = "Library and tool for parsing .eventlog files from GHC";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -74213,15 +75003,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ghc-exactprint_0_5_4_0" = callPackage
+  "ghc-exactprint_0_5_5_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, Diff, directory
      , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl
      , silently, syb
      }:
      mkDerivation {
        pname = "ghc-exactprint";
-       version = "0.5.4.0";
-       sha256 = "1kpfk81iir3dn4420lczwal9bhs787z24g05vdd0g44jcp07d6nk";
+       version = "0.5.5.0";
+       sha256 = "0k3y39k1cwb3bs85333gj7fi6l5p9nr950vgzbyswgj13qb4g7b1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -74401,6 +75191,8 @@ self: {
        pname = "ghc-mod";
        version = "5.8.0.0";
        sha256 = "1yf4fkg1xj1b66jg6kikzc6djad1xi44y7ark7ghgif0ab0g6rn3";
+       revision = "1";
+       editedCabalFile = "11rccscsxv4x7xcdxaz83vjisyiadsiq48mn2v1hs8fylqx6dkdf";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [
@@ -74561,12 +75353,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ghc-prim_0_5_0_0" = callPackage
+  "ghc-prim_0_5_1_0" = callPackage
     ({ mkDerivation, rts }:
      mkDerivation {
        pname = "ghc-prim";
-       version = "0.5.0.0";
-       sha256 = "1cnn5gcwnc711ngx5hac3x2s4f6dkdl7li5pc3c02lcghpqf9fs4";
+       version = "0.5.1.0";
+       sha256 = "13ypjfpz5b4zpbr2q8x37nbqjd0224l9g8xn62iv7mbqbgynkbf9";
        libraryHaskellDepends = [ rts ];
        description = "GHC primitives";
        license = stdenv.lib.licenses.bsd3;
@@ -74586,6 +75378,7 @@ self: {
        libraryHaskellDepends = [
          attoparsec base containers scientific text time
        ];
+       executableHaskellDepends = [ base containers scientific text ];
        testHaskellDepends = [
          attoparsec base containers directory filepath process tasty
          tasty-hunit temporary text
@@ -74608,6 +75401,7 @@ self: {
        libraryHaskellDepends = [
          attoparsec base containers scientific text time
        ];
+       executableHaskellDepends = [ base containers scientific text ];
        testHaskellDepends = [
          attoparsec base containers directory filepath process tasty
          tasty-hunit temporary text
@@ -74745,6 +75539,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ attoparsec base containers text time ];
+       executableHaskellDepends = [ attoparsec base containers text ];
        testHaskellDepends = [
          attoparsec base directory filepath process tasty tasty-hunit
          temporary text
@@ -74864,6 +75659,7 @@ self: {
          base equational-reasoning ghc ghc-tcplugins-extra presburger
          reflection
        ];
+       executableHaskellDepends = [ base equational-reasoning ];
        homepage = "https://github.com/konn/ghc-typelits-presburger#readme";
        description = "Presburger Arithmetic Solver for GHC Type-level natural numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -74903,17 +75699,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ghci_8_0_2" = callPackage
+  "ghci_8_2_1" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
-     , deepseq, filepath, ghc-boot, template-haskell, transformers, unix
+     , deepseq, filepath, ghc-boot, ghc-boot-th, template-haskell
+     , transformers, unix
      }:
      mkDerivation {
        pname = "ghci";
-       version = "8.0.2";
-       sha256 = "0dg1vlv1qj003xm9klqkzhrdkdcwa1nbnhgl86dpq1z15a74svcq";
+       version = "8.2.1";
+       sha256 = "1nxcqnfnggpg8a04496nk59p4jmvxsjqi7425g6h970cinh2lm5f";
        libraryHaskellDepends = [
          array base binary bytestring containers deepseq filepath ghc-boot
-         template-haskell transformers unix
+         ghc-boot-th template-haskell transformers unix
        ];
        description = "The library supporting GHC's interactive interpreter";
        license = stdenv.lib.licenses.bsd3;
@@ -75100,7 +75897,7 @@ self: {
 
   "ghcjs-dom-hello" = callPackage
     ({ mkDerivation, base, ghcjs-dom, jsaddle, jsaddle-warp
-     , jsaddle-webkit2gtk, mtl
+     , jsaddle-webkit2gtk, jsaddle-wkwebview, mtl
      }:
      mkDerivation {
        pname = "ghcjs-dom-hello";
@@ -75112,7 +75909,8 @@ self: {
          base ghcjs-dom jsaddle jsaddle-warp mtl
        ];
        executableHaskellDepends = [
-         base ghcjs-dom jsaddle-warp jsaddle-webkit2gtk mtl
+         base ghcjs-dom jsaddle-warp jsaddle-webkit2gtk jsaddle-wkwebview
+         mtl
        ];
        homepage = "https://github.com/ghcjs/ghcjs-dom-hello";
        description = "GHCJS DOM Hello World, an example package";
@@ -75134,11 +75932,16 @@ self: {
      }) {};
 
   "ghcjs-dom-jsffi" = callPackage
-    ({ mkDerivation }:
+    ({ mkDerivation, base, ghc-prim, ghcjs-base, ghcjs-prim, text
+     , transformers
+     }:
      mkDerivation {
        pname = "ghcjs-dom-jsffi";
        version = "0.9.1.1";
        sha256 = "1hx8w7x5j2gznkk32yplnnm657hyfk41lcxl4iinsjkm0lrlq54i";
+       libraryHaskellDepends = [
+         base ghc-prim ghcjs-base ghcjs-prim text transformers
+       ];
        description = "DOM library using JSFFI and GHCJS";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -75233,6 +76036,9 @@ self: {
          base containers ghc-prim ghcjs-base ghcjs-ffiqq ghcjs-prim split
          template-haskell
        ];
+       executableHaskellDepends = [
+         base containers ghcjs-base ghcjs-ffiqq
+       ];
        description = "Virtual-dom bindings for GHCJS";
        license = stdenv.lib.licenses.mit;
        broken = true;
@@ -76197,6 +77003,7 @@ self: {
          microlens microlens-th mtl network-uri servant servant-client text
          transformers
        ];
+       executableHaskellDepends = [ base network-uri text ];
        testHaskellDepends = [
          aeson base basic-prelude bytestring containers directory hspec lens
          network-uri text
@@ -76719,6 +77526,37 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "github_0_16_0" = callPackage
+    ({ mkDerivation, aeson, aeson-compat, base, base-compat
+     , base16-bytestring, binary, binary-orphans, byteable, bytestring
+     , containers, cryptohash, deepseq, deepseq-generics, exceptions
+     , file-embed, hashable, hspec, http-client, http-client-tls
+     , http-link-header, http-types, iso8601-time, mtl, network-uri
+     , semigroups, text, time, tls, transformers, transformers-compat
+     , unordered-containers, vector, vector-instances
+     }:
+     mkDerivation {
+       pname = "github";
+       version = "0.16.0";
+       sha256 = "0cr5cw3057sk86flb3annjn0yndbw4xz059vsigk52xwydjgxyqw";
+       libraryHaskellDepends = [
+         aeson aeson-compat base base-compat base16-bytestring binary
+         binary-orphans byteable bytestring containers cryptohash deepseq
+         deepseq-generics exceptions hashable http-client http-client-tls
+         http-link-header http-types iso8601-time mtl network-uri semigroups
+         text time tls transformers transformers-compat unordered-containers
+         vector vector-instances
+       ];
+       testHaskellDepends = [
+         aeson-compat base base-compat file-embed hspec unordered-containers
+         vector
+       ];
+       homepage = "https://github.com/phadej/github";
+       description = "Access to the GitHub API, v3";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "github-backup" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, directory
      , exceptions, filepath, git, github, hslogger, IfElse, MissingH
@@ -76788,6 +77626,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "github-release_1_0_4" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, http-client
+     , http-client-tls, http-types, mime-types, optparse-generic, text
+     , unordered-containers, uri-templater
+     }:
+     mkDerivation {
+       pname = "github-release";
+       version = "1.0.4";
+       sha256 = "00iibn9fh0g8ch8v544v47jvjfar8p86kpaq85x1mvjp1f9m554c";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring http-client http-client-tls http-types
+         mime-types optparse-generic text unordered-containers uri-templater
+       ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/tfausak/github-release#readme";
+       description = "Upload files to GitHub releases";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "github-tools" = callPackage
     ({ mkDerivation, base, bytestring, containers, exceptions, github
      , groom, html, http-client, http-client-tls, monad-parallel
@@ -77615,6 +78475,8 @@ self: {
        pname = "glirc";
        version = "2.23";
        sha256 = "0iv4n6i63f1x1808a3dvrbxyibi7jd1c8barsqbf9h1bqwazgsah";
+       revision = "1";
+       editedCabalFile = "1grjnv2krrncm6swf53mkvfvsd5qwrn2ixpfzwqvkrfy17bjskp9";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -81226,8 +82088,8 @@ self: {
      }:
      mkDerivation {
        pname = "google-maps-geocoding";
-       version = "0.3.0.0";
-       sha256 = "1cirpv7ckxnly56ia7wd67djkas99yp9b9qb3cvi996jgwwl7d8i";
+       version = "0.4.0.0";
+       sha256 = "1n8zdmm9j8ghd73i0ph8llzbb4bmkni05r16zvs9rfs6ii126bg3";
        libraryHaskellDepends = [
          aeson base google-static-maps http-client servant servant-client
          text
@@ -81235,6 +82097,7 @@ self: {
        homepage = "https://github.com/mpilgrem/google-maps-geocoding#readme";
        description = "Google Maps Geocoding API bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "google-oauth2" = callPackage
@@ -81329,8 +82192,8 @@ self: {
      }:
      mkDerivation {
        pname = "google-static-maps";
-       version = "0.4.0.0";
-       sha256 = "0r1ln013939vw6jqs1hdljyk2z7wxq2jjwr5v8pci2dcii9ryph1";
+       version = "0.5.0.0";
+       sha256 = "0iicdiai21wldza2nc1m71j6c923mwwfbhnhzw5p9l623dggjrib";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytedump bytestring cryptonite
          double-conversion http-client JuicyPixels memory MissingH
@@ -81340,6 +82203,7 @@ self: {
        homepage = "https://github.com/mpilgrem/google-static-maps#readme";
        description = "Bindings to the Google Static Maps API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "google-translate" = callPackage
@@ -81558,9 +82422,10 @@ self: {
      }) {};
 
   "gore-and-ash-lambdacube" = callPackage
-    ({ mkDerivation, base, containers, deepseq, exceptions
-     , gore-and-ash, hashable, lambdacube-compiler, lambdacube-gl, mtl
-     , text, unordered-containers
+    ({ mkDerivation, base, containers, deepseq, exceptions, GLFW-b
+     , gore-and-ash, gore-and-ash-glfw, hashable, JuicyPixels
+     , lambdacube-compiler, lambdacube-gl, lambdacube-ir, linear, mtl
+     , text, transformers, unordered-containers, vector
      }:
      mkDerivation {
        pname = "gore-and-ash-lambdacube";
@@ -81572,6 +82437,11 @@ self: {
          base containers deepseq exceptions gore-and-ash hashable
          lambdacube-compiler lambdacube-gl mtl text unordered-containers
        ];
+       executableHaskellDepends = [
+         base containers deepseq exceptions GLFW-b gore-and-ash
+         gore-and-ash-glfw JuicyPixels lambdacube-compiler lambdacube-gl
+         lambdacube-ir linear mtl text transformers vector
+       ];
        homepage = "https://github.com/TeaspotStudio/gore-and-ash-lambdacube#readme";
        description = "Core module for Gore&Ash engine that do something";
        license = stdenv.lib.licenses.bsd3;
@@ -82476,6 +83346,9 @@ self: {
          base bytestring colour containers directory dlist fgl filepath
          polyparse process temporary text transformers wl-pprint-text
        ];
+       executableHaskellDepends = [
+         base bytestring directory filepath text
+       ];
        testHaskellDepends = [
          base containers fgl fgl-arbitrary filepath QuickCheck text
        ];
@@ -82501,6 +83374,9 @@ self: {
          base bytestring colour containers directory dlist fgl filepath
          polyparse process temporary text transformers wl-pprint-text
        ];
+       executableHaskellDepends = [
+         base bytestring directory filepath text
+       ];
        testHaskellDepends = [
          base containers fgl fgl-arbitrary filepath QuickCheck text
        ];
@@ -83009,6 +83885,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "groundhog-th_0_8_0_1" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, groundhog
+     , template-haskell, text, time, unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "groundhog-th";
+       version = "0.8.0.1";
+       sha256 = "00vk26qa7r6znyz848rh66nn4blybprpqvvyh53h22i9ibrk2b1s";
+       libraryHaskellDepends = [
+         aeson base bytestring containers groundhog template-haskell text
+         time unordered-containers yaml
+       ];
+       description = "Type-safe datatype-database mapping library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "group-by-date" = callPackage
     ({ mkDerivation, base, explicit-exception, filemanip, hsshellscript
      , pathtype, time, transformers, unix-compat, utility-ht
@@ -83617,7 +84510,8 @@ self: {
 
   "gtk3" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers
-     , gio, glib, gtk2hs-buildtools, gtk3, mtl, pango, text
+     , gio, glib, gtk2hs-buildtools, gtk3, mtl, pango, text, time
+     , transformers
      }:
      mkDerivation {
        pname = "gtk3";
@@ -83630,6 +84524,9 @@ self: {
          array base bytestring cairo containers gio glib mtl pango text
        ];
        libraryPkgconfigDepends = [ gtk3 ];
+       executableHaskellDepends = [
+         array base cairo text time transformers
+       ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Gtk+ 3 graphical user interface library";
        license = stdenv.lib.licenses.lgpl21;
@@ -83928,6 +84825,7 @@ self: {
        homepage = "https://bitbucket.org/fmapE/h2c";
        description = "Bindings to Linux I2C with support for repeated-start transactions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hArduino" = callPackage
@@ -85062,8 +85960,8 @@ self: {
      }) {};
 
   "hackage-server" = callPackage
-    ({ mkDerivation, acid-state, aeson, alex, array, async, base
-     , base16-bytestring, base64-bytestring, binary, blaze-builder
+    ({ mkDerivation, acid-state, aeson, alex, array, async, attoparsec
+     , base, base16-bytestring, base64-bytestring, binary, blaze-builder
      , bytestring, Cabal, cereal, containers, crypto-api, csv, deepseq
      , directory, filepath, happstack-server, happy, HaXml, hscolour
      , hslogger, HStringTemplate, HTTP, lifted-base, mime-mail, mtl
@@ -85079,7 +85977,7 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         acid-state aeson array async base base16-bytestring
+         acid-state aeson array async attoparsec base base16-bytestring
          base64-bytestring binary blaze-builder bytestring Cabal cereal
          containers crypto-api csv deepseq directory filepath
          happstack-server HaXml hscolour hslogger HStringTemplate HTTP
@@ -85362,8 +86260,8 @@ self: {
     ({ mkDerivation, base, filepath, haddock-api, hspec }:
      mkDerivation {
        pname = "haddock";
-       version = "2.17.5";
-       sha256 = "1qxy6yxpxgpqpwcs76ydpal45cz4a3hyq3rq07cwma1cs4p034ql";
+       version = "2.18.1";
+       sha256 = "1gg1nl38f2h93xci4pa4zgb5wvcpwv0mab0balmzzgnd4amk3jgv";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base haddock-api ];
@@ -85373,6 +86271,7 @@ self: {
        homepage = "http://www.haskell.org/haddock/";
        description = "A documentation-generation tool for Haskell libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haddock-api_2_15_0_2" = callPackage
@@ -85420,8 +86319,8 @@ self: {
      }:
      mkDerivation {
        pname = "haddock-api";
-       version = "2.17.4";
-       sha256 = "00fn6pzgg8xjbaw12d76jdqh2dbc5xy7miyz0x6kidvvar7i35ss";
+       version = "2.18.1";
+       sha256 = "1q0nf86h6b466yd3bhng8sklm0kqc8bak4k6d4dcc57j3wf2gak8";
        libraryHaskellDepends = [
          array base bytestring Cabal containers deepseq directory filepath
          ghc ghc-boot ghc-paths haddock-library transformers xhtml
@@ -85486,6 +86385,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "haddock-library_1_4_4" = callPackage
+    ({ mkDerivation, attoparsec, base, base-compat, bytestring, deepseq
+     , hspec, QuickCheck, transformers
+     }:
+     mkDerivation {
+       pname = "haddock-library";
+       version = "1.4.4";
+       sha256 = "0dx5hawfanglhkj5nqq1dwr2j1v35p0syz30xvdk8gld8rif06p9";
+       libraryHaskellDepends = [
+         attoparsec base bytestring transformers
+       ];
+       testHaskellDepends = [
+         attoparsec base base-compat bytestring deepseq hspec QuickCheck
+         transformers
+       ];
+       homepage = "http://www.haskell.org/haddock/";
+       description = "Library exposing some functionality of Haddock";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haddock-test" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, directory, filepath
      , process, syb, xhtml, xml
@@ -86967,7 +87887,7 @@ self: {
      }) {inherit (pkgs) libappindicator-gtk2;};
 
   "happindicator3" = callPackage
-    ({ mkDerivation, base, glib, gtk3, libappindicator-gtk3 }:
+    ({ mkDerivation, base, glib, gtk3, libappindicator-gtk3, text }:
      mkDerivation {
        pname = "happindicator3";
        version = "0.2.1";
@@ -86976,6 +87896,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base glib gtk3 ];
        libraryPkgconfigDepends = [ libappindicator-gtk3 ];
+       executableHaskellDepends = [ base gtk3 text ];
        homepage = "https://github.com/mlacorte/happindicator3";
        description = "Binding to the appindicator library";
        license = stdenv.lib.licenses.lgpl21;
@@ -87117,6 +88038,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "happstack-authenticate_2_3_4_8" = callPackage
+    ({ mkDerivation, acid-state, aeson, authenticate, base
+     , base64-bytestring, boomerang, bytestring, containers
+     , data-default, email-validate, filepath, happstack-hsp
+     , happstack-jmacro, happstack-server, hsp, hsx-jmacro, hsx2hs
+     , http-conduit, http-types, ixset-typed, jmacro, jwt, lens
+     , mime-mail, mtl, pwstore-purehaskell, random, safecopy
+     , shakespeare, text, time, unordered-containers, userid, web-routes
+     , web-routes-boomerang, web-routes-happstack, web-routes-hsp
+     , web-routes-th
+     }:
+     mkDerivation {
+       pname = "happstack-authenticate";
+       version = "2.3.4.8";
+       sha256 = "006prds4bgqmj54j0syyf1y1yyqwfcj2a6mdxpcjj6qj3g3976l1";
+       libraryHaskellDepends = [
+         acid-state aeson authenticate base base64-bytestring boomerang
+         bytestring containers data-default email-validate filepath
+         happstack-hsp happstack-jmacro happstack-server hsp hsx-jmacro
+         hsx2hs http-conduit http-types ixset-typed jmacro jwt lens
+         mime-mail mtl pwstore-purehaskell random safecopy shakespeare text
+         time unordered-containers userid web-routes web-routes-boomerang
+         web-routes-happstack web-routes-hsp web-routes-th
+       ];
+       homepage = "http://www.happstack.com/";
+       description = "Happstack Authentication Library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "happstack-clientsession" = callPackage
     ({ mkDerivation, base, bytestring, cereal, clientsession
      , happstack-server, monad-control, mtl, safecopy, transformers-base
@@ -87137,7 +88088,7 @@ self: {
   "happstack-contrib" = callPackage
     ({ mkDerivation, base, bytestring, directory, happstack-data
      , happstack-ixset, happstack-server, happstack-state
-     , happstack-util, HTTP, mtl, network, old-time, syb, unix
+     , happstack-util, HTTP, HUnit, mtl, network, old-time, syb, unix
      }:
      mkDerivation {
        pname = "happstack-contrib";
@@ -87150,6 +88101,7 @@ self: {
          happstack-server happstack-state happstack-util HTTP mtl network
          old-time syb unix
        ];
+       executableHaskellDepends = [ HUnit ];
        homepage = "http://happstack.com";
        description = "Web related tools and services";
        license = stdenv.lib.licenses.bsd3;
@@ -87365,6 +88317,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "happstack-hsp_7_3_7_3" = callPackage
+    ({ mkDerivation, base, bytestring, happstack-server, harp, hsp
+     , hsx2hs, mtl, syb, text, utf8-string
+     }:
+     mkDerivation {
+       pname = "happstack-hsp";
+       version = "7.3.7.3";
+       sha256 = "0m7psd6dg33xijshs3dxz2xrqghmpbs402h67b52pkqsk5nmy633";
+       libraryHaskellDepends = [
+         base bytestring happstack-server harp hsp hsx2hs mtl syb text
+         utf8-string
+       ];
+       homepage = "http://www.happstack.com/";
+       description = "Support for using HSP templates in Happstack";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "happstack-hstringtemplate" = callPackage
     ({ mkDerivation, base, bytestring, happstack-server, hslogger
      , HStringTemplate, mtl
@@ -87420,6 +88390,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "happstack-jmacro_7_0_12" = callPackage
+    ({ mkDerivation, base, base64-bytestring, bytestring, cereal
+     , digest, happstack-server, jmacro, text, utf8-string
+     , wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "happstack-jmacro";
+       version = "7.0.12";
+       sha256 = "1bmffidqi784y1qwgqxncwcw6knklnkliznbdx66gjvkfccv9d5s";
+       libraryHaskellDepends = [
+         base base64-bytestring bytestring cereal digest happstack-server
+         jmacro text utf8-string wl-pprint-text
+       ];
+       homepage = "http://www.happstack.com/";
+       description = "Support for using JMacro with Happstack";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "happstack-lite" = callPackage
     ({ mkDerivation, base, bytestring, happstack-server, mtl, text }:
      mkDerivation {
@@ -87496,6 +88485,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "happstack-server_7_5_0" = callPackage
+    ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring
+     , containers, directory, exceptions, extensible-exceptions
+     , filepath, hslogger, html, HUnit, monad-control, mtl, network
+     , network-uri, old-locale, parsec, process, sendfile, syb
+     , system-filepath, template-haskell, text, threads, time
+     , time-compat, transformers, transformers-base, transformers-compat
+     , unix, utf8-string, xhtml, zlib
+     }:
+     mkDerivation {
+       pname = "happstack-server";
+       version = "7.5.0";
+       sha256 = "0ybwzb9w6mzw9mjr10rpih9hh1cs4v0wdaizl7p5l34xk441qaxw";
+       libraryHaskellDepends = [
+         base base64-bytestring blaze-html bytestring containers directory
+         exceptions extensible-exceptions filepath hslogger html
+         monad-control mtl network network-uri old-locale parsec process
+         sendfile syb system-filepath template-haskell text threads time
+         time-compat transformers transformers-base transformers-compat unix
+         utf8-string xhtml zlib
+       ];
+       testHaskellDepends = [
+         base bytestring containers HUnit parsec zlib
+       ];
+       homepage = "http://happstack.com";
+       description = "Web related tools and services";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "happstack-server-tls" = callPackage
     ({ mkDerivation, base, bytestring, extensible-exceptions
      , happstack-server, hslogger, HsOpenSSL, network, openssl, sendfile
@@ -87516,6 +88535,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openssl;};
 
+  "happstack-server-tls_7_1_6_3" = callPackage
+    ({ mkDerivation, base, bytestring, extensible-exceptions
+     , happstack-server, hslogger, HsOpenSSL, network, openssl, sendfile
+     , time, unix
+     }:
+     mkDerivation {
+       pname = "happstack-server-tls";
+       version = "7.1.6.3";
+       sha256 = "0bpa0clcfq0jgb6y8wm331411w5mryjj4aknnn0sb74dx122lhyz";
+       libraryHaskellDepends = [
+         base bytestring extensible-exceptions happstack-server hslogger
+         HsOpenSSL network sendfile time unix
+       ];
+       librarySystemDepends = [ openssl ];
+       homepage = "http://www.happstack.com/";
+       description = "extend happstack-server with https:// support (TLS/SSL)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) openssl;};
+
   "happstack-server-tls-cryptonite" = callPackage
     ({ mkDerivation, base, bytestring, cryptonite, data-default-class
      , extensible-exceptions, happstack-server, hslogger, network
@@ -89184,6 +90223,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "haskell-lsp" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, data-default
+     , directory, filepath, hashable, hslogger, hspec, lens, mtl, parsec
+     , stm, text, time, transformers, unordered-containers, vector
+     , yi-rope
+     }:
+     mkDerivation {
+       pname = "haskell-lsp";
+       version = "0.1.0.0";
+       sha256 = "135f9xqzlvz01gwdqwxvdmxiwwqvka5j3iv13zczzzzn7vwfnbbd";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers data-default directory filepath
+         hashable hslogger lens mtl parsec stm text time
+         unordered-containers yi-rope
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring containers data-default directory filepath
+         hslogger lens mtl parsec stm text time transformers
+         unordered-containers vector yi-rope
+       ];
+       testHaskellDepends = [
+         aeson base containers directory hashable hspec lens text yi-rope
+       ];
+       homepage = "https://github.com/alanz/haskell-lsp";
+       description = "Haskell library for the Microsoft Language Server Protocol";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haskell-menu" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -91287,6 +92357,7 @@ self: {
          base data-accessor event-list haskore non-negative numeric-prelude
          random synthesizer-core synthesizer-filter utility-ht
        ];
+       executableHaskellDepends = [ base synthesizer-core utility-ht ];
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Music rendering coded in Haskell";
        license = "GPL";
@@ -91854,10 +92925,12 @@ self: {
      }) {};
 
   "haste-compiler" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers
-     , data-binary-ieee754, directory, filepath, ghc, ghc-paths
-     , ghc-prim, monads-tf, network, network-uri, process, random
-     , shellmate, transformers, utf8-string, websockets
+    ({ mkDerivation, array, base, bin-package-db, binary, blaze-builder
+     , bytestring, bzlib, Cabal, containers, data-binary-ieee754
+     , directory, either, filepath, ghc, ghc-paths, ghc-prim, ghc-simple
+     , HTTP, monads-tf, mtl, network, network-uri, process, random
+     , shellmate, system-fileio, tar, terminfo, transformers, unix
+     , utf8-string, websockets
      }:
      mkDerivation {
        pname = "haste-compiler";
@@ -91871,6 +92944,12 @@ self: {
          filepath ghc ghc-paths ghc-prim monads-tf network network-uri
          process random shellmate transformers utf8-string websockets
        ];
+       executableHaskellDepends = [
+         array base bin-package-db binary blaze-builder bytestring bzlib
+         Cabal containers directory either filepath ghc ghc-paths ghc-prim
+         ghc-simple HTTP mtl network network-uri process random shellmate
+         system-fileio tar terminfo transformers unix utf8-string
+       ];
        homepage = "http://haste-lang.org/";
        description = "Haskell To ECMAScript compiler";
        license = stdenv.lib.licenses.bsd3;
@@ -92204,6 +93283,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haxl_0_5_1_0" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, containers
+     , deepseq, exceptions, filepath, ghc-prim, hashable, HUnit, pretty
+     , test-framework, test-framework-hunit, text, time, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "haxl";
+       version = "0.5.1.0";
+       sha256 = "09x84igm35d60rg97bcm1q9ivin01i5x64n3hl1j3ls62q28bm29";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base binary bytestring containers deepseq exceptions filepath
+         ghc-prim hashable HUnit pretty text time transformers
+         unordered-containers vector
+       ];
+       executableHaskellDepends = [ base hashable time ];
+       testHaskellDepends = [
+         aeson base binary bytestring containers deepseq filepath hashable
+         HUnit test-framework test-framework-hunit text time
+         unordered-containers
+       ];
+       homepage = "https://github.com/facebook/Haxl";
+       description = "A Haskell library for efficient, concurrent, and concise data access";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haxl-amazonka" = callPackage
     ({ mkDerivation, amazonka, amazonka-core, async, base, conduit
      , hashable, haxl, transformers
@@ -92732,6 +93840,7 @@ self: {
        doHaddock = false;
        description = "Haskell COM support library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hcoord" = callPackage
@@ -93301,14 +94410,14 @@ self: {
      }) {};
 
   "heapsort" = callPackage
-    ({ mkDerivation, array, base }:
+    ({ mkDerivation, array, base, QuickCheck }:
      mkDerivation {
        pname = "heapsort";
        version = "0.1.0";
        sha256 = "0fzws9fjhqsygsbwj7nvj786j16264vqvqzc97dr73y72538k9qa";
        isLibrary = true;
        isExecutable = true;
-       executableHaskellDepends = [ array base ];
+       executableHaskellDepends = [ array base QuickCheck ];
        homepage = "http://wiki.cs.pdx.edu/bartforge/heapsort";
        description = "Heapsort of MArrays as a demo of imperative programming";
        license = stdenv.lib.licenses.bsd3;
@@ -94736,6 +95845,7 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ doublefann ];
        libraryPkgconfigDepends = [ fann ];
+       executableHaskellDepends = [ base ];
        executableSystemDepends = [ doublefann ];
        description = "Haskell binding to the FANN library";
        license = stdenv.lib.licenses.bsd3;
@@ -94907,13 +96017,13 @@ self: {
 
   "hfsevents" = callPackage
     ({ mkDerivation, base, bytestring, cereal, Cocoa, CoreServices, mtl
-     , text
+     , text, unix
      }:
      mkDerivation {
        pname = "hfsevents";
        version = "0.1.6";
        sha256 = "019zbnvfd866ch49gax0c1c93zv92142saim1hrgypz5lprz7hvl";
-       libraryHaskellDepends = [ base bytestring cereal mtl text ];
+       libraryHaskellDepends = [ base bytestring cereal mtl text unix ];
        librarySystemDepends = [ Cocoa ];
        libraryToolDepends = [ CoreServices ];
        homepage = "http://github.com/luite/hfsevents";
@@ -95258,6 +96368,7 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        librarySystemDepends = [ grib_api ];
        libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [ base ];
        testHaskellDepends = [ base directory hspec ];
        homepage = "https://github.com/mjakob/hgrib";
        description = "Unofficial bindings for GRIB API";
@@ -95411,6 +96522,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hidden-char_0_1_0_1" = callPackage
+    ({ mkDerivation, base, hspec }:
+     mkDerivation {
+       pname = "hidden-char";
+       version = "0.1.0.1";
+       sha256 = "17g9wbk34x8gkgrlvj3barhirq0jkshysqrxhs8nxp60hb2zpxip";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "https://github.com/rcook/hidden-char#readme";
+       description = "Provides getHiddenChar function";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hieraclus" = callPackage
     ({ mkDerivation, base, containers, HUnit, mtl, multiset }:
      mkDerivation {
@@ -95705,13 +96830,16 @@ self: {
        libraryHaskellDepends = [
          base blaze-html bytestring filepath mtl pcre-light text
        ];
+       executableHaskellDepends = [
+         base blaze-html bytestring filepath mtl pcre-light text
+       ];
        description = "source code highlighting";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "highlighter2" = callPackage
-    ({ mkDerivation, base, blaze-html, bytestring, containers, filepath
-     , mtl, pcre-light, text
+    ({ mkDerivation, base, blaze-html, blaze-markup, bytestring
+     , containers, filepath, mtl, pcre-light, text
      }:
      mkDerivation {
        pname = "highlighter2";
@@ -95722,6 +96850,10 @@ self: {
        libraryHaskellDepends = [
          base blaze-html bytestring containers filepath mtl pcre-light text
        ];
+       executableHaskellDepends = [
+         base blaze-html blaze-markup bytestring containers filepath mtl
+         pcre-light text
+       ];
        description = "source code highlighting";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -95742,6 +96874,7 @@ self: {
          base blaze-html bytestring containers mtl parsec pcre-light
          utf8-string
        ];
+       executableHaskellDepends = [ base blaze-html containers filepath ];
        testHaskellDepends = [
          base blaze-html containers Diff directory filepath process
        ];
@@ -95756,8 +96889,8 @@ self: {
      }:
      mkDerivation {
        pname = "hills";
-       version = "0.1.2.5";
-       sha256 = "02zmjc056phi8xcdx8i86xms5204q1zkcg9c5dbd8phm11a5n3iz";
+       version = "0.1.2.6";
+       sha256 = "0ggdppg7mbq3ljrb4hvracdv81m9jqnsrl6iqy56sba118k7m0jh";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -96716,8 +97849,8 @@ self: {
 
   "hlatex" = callPackage
     ({ mkDerivation, base, base-unicode-symbols, containers, derive
-     , directory, filepath, mtl, process, template-haskell, transformers
-     , uniplate, utf8-string
+     , directory, filepath, frquotes, mtl, process, template-haskell
+     , transformers, uniplate, utf8-string
      }:
      mkDerivation {
        pname = "hlatex";
@@ -96729,6 +97862,9 @@ self: {
          base base-unicode-symbols containers derive directory filepath mtl
          process template-haskell transformers uniplate utf8-string
        ];
+       executableHaskellDepends = [
+         base base-unicode-symbols containers frquotes mtl transformers
+       ];
        description = "A library to build valid LaTeX files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -96897,8 +98033,8 @@ self: {
     ({ mkDerivation, base, hledger-lib, text, time }:
      mkDerivation {
        pname = "hledger-diff";
-       version = "0.2.0.9";
-       sha256 = "0ajjiz6jvm45j472f0ypxk33hc47rg0zs9ylkcrkvvk9992x7lnq";
+       version = "0.2.0.10";
+       sha256 = "1sslida2pl8r7lfab6lwkws0fq2a8h14rqq01qnxdg2pmfl6q69y";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base hledger-lib text time ];
@@ -96939,6 +98075,7 @@ self: {
        homepage = "https://github.com/hpdeifel/hledger-iadd#readme";
        description = "A terminal UI as drop-in replacement for hledger add";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hledger-interest" = callPackage
@@ -97020,6 +98157,8 @@ self: {
        pname = "hledger-ui";
        version = "1.3";
        sha256 = "0bixkihc2hcf98xpnb9a8lnqi5rcg2pj6d78w4pzwzd83vkmr1rj";
+       revision = "1";
+       editedCabalFile = "0dc5nqc9g4s0h1si6pcymbhfw32hlxafzavpp8y1jg7c9brc7ln0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -97272,6 +98411,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base stm transformers unix X11 ];
+       executableHaskellDepends = [ base stm transformers unix X11 ];
        homepage = "https://github.com/hpdeifel/hlwm-haskell";
        description = "Bindings to the herbstluftwm window manager";
        license = stdenv.lib.licenses.bsd2;
@@ -97960,8 +99100,8 @@ self: {
      }) {};
 
   "hoauth2" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, http-conduit, http-types
-     , text, unordered-containers
+    ({ mkDerivation, aeson, base, bytestring, containers, http-conduit
+     , http-types, text, unordered-containers, wai, warp
      }:
      mkDerivation {
        pname = "hoauth2";
@@ -97973,15 +99113,19 @@ self: {
          aeson base bytestring http-conduit http-types text
          unordered-containers
        ];
+       executableHaskellDepends = [
+         aeson base bytestring containers http-conduit http-types text wai
+         warp
+       ];
        homepage = "https://github.com/freizl/hoauth2";
        description = "Haskell OAuth2 authentication client";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "hoauth2_1_3_0" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, exceptions, http-conduit
-     , http-types, microlens, text, unordered-containers, uri-bytestring
-     , uri-bytestring-aeson
+    ({ mkDerivation, aeson, base, bytestring, containers, exceptions
+     , http-conduit, http-types, microlens, text, unordered-containers
+     , uri-bytestring, uri-bytestring-aeson, wai, warp
      }:
      mkDerivation {
        pname = "hoauth2";
@@ -97993,6 +99137,10 @@ self: {
          aeson base bytestring exceptions http-conduit http-types microlens
          text unordered-containers uri-bytestring uri-bytestring-aeson
        ];
+       executableHaskellDepends = [
+         aeson base bytestring containers http-conduit http-types text
+         uri-bytestring wai warp
+       ];
        homepage = "https://github.com/freizl/hoauth2";
        description = "Haskell OAuth2 authentication client";
        license = stdenv.lib.licenses.bsd3;
@@ -99448,37 +100596,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hpack_0_17_1" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring
-     , containers, deepseq, directory, filepath, Glob, hspec
-     , interpolate, mockery, QuickCheck, temporary, text
-     , unordered-containers, yaml
-     }:
-     mkDerivation {
-       pname = "hpack";
-       version = "0.17.1";
-       sha256 = "0lxpjv5j3bg725n1kqjgpcq3rb3s7zc1w3j5snc92ayk8fxpbd3n";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base base-compat bytestring containers deepseq directory
-         filepath Glob text unordered-containers yaml
-       ];
-       executableHaskellDepends = [
-         aeson base base-compat bytestring containers deepseq directory
-         filepath Glob text unordered-containers yaml
-       ];
-       testHaskellDepends = [
-         aeson aeson-qq base base-compat bytestring containers deepseq
-         directory filepath Glob hspec interpolate mockery QuickCheck
-         temporary text unordered-containers yaml
-       ];
-       homepage = "https://github.com/sol/hpack#readme";
-       description = "An alternative format for Haskell packages";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "hpack" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring
      , containers, deepseq, directory, filepath, Glob, hspec
@@ -99693,6 +100810,8 @@ self: {
        pname = "hpc";
        version = "0.6.0.3";
        sha256 = "1am2fcxg7d3j3kpyhz48wzbpg83dk2jmzhqm4yiib649alzcgnhn";
+       revision = "1";
+       editedCabalFile = "1bddfsgn48kh8qa72asgmx7z4ym00zkh09g3hqp6l6yl919drn2i";
        libraryHaskellDepends = [
          base containers directory filepath time
        ];
@@ -99927,22 +101046,22 @@ self: {
 
   "hpqtypes-extras" = callPackage
     ({ mkDerivation, base, base16-bytestring, bytestring, containers
-     , cryptohash, exceptions, fields-json, hpqtypes, lifted-base, log
-     , monad-control, mtl, safe, tasty, tasty-hunit, text, text-show
-     , transformers
+     , cryptohash, exceptions, fields-json, hpqtypes, lifted-base
+     , log-base, monad-control, mtl, safe, tasty, tasty-hunit, text
+     , text-show, transformers
      }:
      mkDerivation {
        pname = "hpqtypes-extras";
-       version = "1.3.0.0";
-       sha256 = "10n97i18g94j8xc7zayp03a3b59kzjyhxs1kg06cy1npgbn8kvlz";
+       version = "1.3.1.1";
+       sha256 = "01ckscym6lgb6k63n6g0q9972imabv4kncsxr2h37xkahfyh68hk";
        libraryHaskellDepends = [
          base base16-bytestring bytestring containers cryptohash exceptions
-         fields-json hpqtypes lifted-base log monad-control mtl safe text
-         text-show
+         fields-json hpqtypes lifted-base log-base monad-control mtl safe
+         text text-show
        ];
        testHaskellDepends = [
-         base exceptions hpqtypes lifted-base log tasty tasty-hunit text
-         transformers
+         base exceptions hpqtypes lifted-base log-base monad-control tasty
+         tasty-hunit text transformers
        ];
        homepage = "https://github.com/scrive/hpqtypes-extras";
        description = "Extra utilities for hpqtypes library";
@@ -100010,7 +101129,7 @@ self: {
      }) {};
 
   "hps" = callPackage
-    ({ mkDerivation, base, hcg-minus }:
+    ({ mkDerivation, base, directory, filepath, hcg-minus, random }:
      mkDerivation {
        pname = "hps";
        version = "0.15";
@@ -100018,6 +101137,9 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base hcg-minus ];
+       executableHaskellDepends = [
+         base directory filepath hcg-minus random
+       ];
        homepage = "http://rd.slavepianos.org/?t=hps";
        description = "Haskell Postscript";
        license = "GPL";
@@ -100270,6 +101392,27 @@ self: {
        hydraPlatforms = [ "x86_64-linux" ];
      }) {inherit (pkgs) ruby;};
 
+  "hruby_0_3_4_4" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, QuickCheck
+     , ruby, scientific, stm, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "hruby";
+       version = "0.3.4.4";
+       sha256 = "08997g32rnmwznzywf1k0bmki0kbcwss9s4lka6s501l54gp1ij9";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring scientific stm text
+         unordered-containers vector
+       ];
+       librarySystemDepends = [ ruby ];
+       testHaskellDepends = [
+         aeson attoparsec base QuickCheck text vector
+       ];
+       description = "Embed a Ruby intepreter in your Haskell program !";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) ruby;};
+
   "hs-GeoIP" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, GeoIP }:
      mkDerivation {
@@ -100786,7 +101929,8 @@ self: {
      }) {};
 
   "hs-server-starter" = callPackage
-    ({ mkDerivation, base, directory, HUnit, network, temporary, unix
+    ({ mkDerivation, base, directory, http-types, HUnit, network
+     , temporary, unix, wai, warp
      }:
      mkDerivation {
        pname = "hs-server-starter";
@@ -100795,12 +101939,30 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory network ];
+       executableHaskellDepends = [ base http-types network wai warp ];
        testHaskellDepends = [ base HUnit network temporary unix ];
        homepage = "https://github.com/hiratara/hs-server-starter";
        description = "Write a server supporting Server::Starter's protocol in Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hs-snowtify" = callPackage
+    ({ mkDerivation, base, either, safe, safe-exceptions, text, turtle
+     }:
+     mkDerivation {
+       pname = "hs-snowtify";
+       version = "0.1.0.0";
+       sha256 = "124n8n6h1qrn359a9bhdxz4was9pc3n2d8r8zqvxaa2xqywjwfvf";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base either safe safe-exceptions text turtle
+       ];
+       homepage = "https://github.com/aiya000/hs-snowtify#README.md";
+       description = "snowtify send your result of `stack build` (`stack test`) to notify-daemon :dog2:";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hs-twitter" = callPackage
     ({ mkDerivation, base, HTTP, json, mime, network, old-locale
      , old-time, random, utf8-string
@@ -101262,9 +102424,10 @@ self: {
 
   "hsc3-graphs" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, cairo, containers
-     , data-default, directory, filepath, hls, hmt, hosc, hps, hsc3
-     , hsc3-cairo, hsc3-lang, hsc3-sf, hsc3-unsafe, hsc3-utils, hsharc
-     , MonadRandom, primes, random, random-shuffle, sc3-rdu, she, split
+     , data-default, directory, filepath, hashable, hls, hmt, hosc, hps
+     , hsc3, hsc3-cairo, hsc3-lang, hsc3-sf, hsc3-unsafe, hsc3-utils
+     , hsharc, MonadRandom, primes, process, random, random-shuffle
+     , sc3-rdu, she, split
      }:
      mkDerivation {
        pname = "hsc3-graphs";
@@ -101278,7 +102441,12 @@ self: {
          hsc3-sf hsc3-unsafe hsc3-utils hsharc MonadRandom primes random
          random-shuffle sc3-rdu she split
        ];
-       executableHaskellDepends = [ base ];
+       executableHaskellDepends = [
+         array base binary bytestring cairo containers directory filepath
+         hashable hls hmt hosc hps hsc3 hsc3-cairo hsc3-lang hsc3-sf
+         hsc3-unsafe hsharc MonadRandom primes process random random-shuffle
+         sc3-rdu split
+       ];
        homepage = "http://rd.slavepianos.org/t/hsc3-graphs";
        description = "Haskell SuperCollider Graphs";
        license = "GPL";
@@ -101359,6 +102527,7 @@ self: {
          base bytestring containers data-default directory filepath hosc
          hsc3 process time time-compat transformers
        ];
+       executableHaskellDepends = [ base data-default hosc hsc3 ];
        homepage = "https://github.com/kaoskorobase/hsc3-process";
        description = "Create and control scsynth processes";
        license = "GPL";
@@ -101400,7 +102569,7 @@ self: {
      , failure, hashtables, hosc, hsc3, hsc3-process, lifted-base
      , ListZipper, monad-control, QuickCheck, random, resourcet
      , test-framework, test-framework-quickcheck2, transformers
-     , transformers-base
+     , transformers-base, unix
      }:
      mkDerivation {
        pname = "hsc3-server";
@@ -101413,6 +102582,9 @@ self: {
          hosc hsc3 hsc3-process lifted-base ListZipper monad-control
          resourcet transformers transformers-base
        ];
+       executableHaskellDepends = [
+         base hosc hsc3 random transformers unix
+       ];
        testHaskellDepends = [
          base failure QuickCheck random test-framework
          test-framework-quickcheck2 transformers
@@ -101764,6 +102936,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base containers network ];
        librarySystemDepends = [ adns ];
+       executableHaskellDepends = [ base network ];
        homepage = "http://github.com/peti/hsdns";
        description = "Asynchronous DNS Resolver";
        license = stdenv.lib.licenses.lgpl3;
@@ -102190,7 +103363,7 @@ self: {
      }) {};
 
   "hslogger" = callPackage
-    ({ mkDerivation, base, containers, directory, mtl, network
+    ({ mkDerivation, base, containers, directory, HUnit, mtl, network
      , old-locale, process, time, unix
      }:
      mkDerivation {
@@ -102200,6 +103373,7 @@ self: {
        libraryHaskellDepends = [
          base containers directory mtl network old-locale process time unix
        ];
+       testHaskellDepends = [ base HUnit ];
        homepage = "http://software.complete.org/hslogger";
        description = "Versatile logging framework";
        license = stdenv.lib.licenses.bsd3;
@@ -102748,6 +103922,8 @@ self: {
        pname = "hspec-contrib";
        version = "0.4.0";
        sha256 = "05hchslqqg0k5ksrgy3n8gay0xxnr1zjp4zfj4zp4v0pxq0j57kg";
+       revision = "1";
+       editedCabalFile = "07p0pckzyih1zc56v2cnchxjsbx4w69b10j343c0yvicq6yjyrkb";
        libraryHaskellDepends = [ base hspec-core HUnit ];
        testHaskellDepends = [ base hspec hspec-core HUnit QuickCheck ];
        homepage = "http://hspec.github.io/";
@@ -104351,6 +105527,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "htirage" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "htirage";
+       version = "1.20170723";
+       sha256 = "184z1bzzs00mkvmbr2p2xk0f5agxxv1xqmgbs0hq9yldpsa2nszc";
+       libraryHaskellDepends = [ base ];
+       description = "Equiprobable draw from publicly verifiable random data";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "htlset" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -105597,6 +106784,11 @@ self: {
          array base bytestring bytestring-builder case-insensitive
          containers psqueues stm
        ];
+       executableHaskellDepends = [
+         aeson aeson-pretty array base bytestring bytestring-builder
+         case-insensitive containers directory filepath hex text
+         unordered-containers vector word8
+       ];
        testHaskellDepends = [
          aeson aeson-pretty array base bytestring bytestring-builder
          case-insensitive containers directory doctest filepath Glob hex
@@ -106323,6 +107515,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hw-balancedparens_0_1_0_2" = callPackage
+    ({ mkDerivation, base, criterion, hspec, hw-bits, hw-excess
+     , hw-prim, hw-rankselect-base, QuickCheck, storable-tuple, vector
+     }:
+     mkDerivation {
+       pname = "hw-balancedparens";
+       version = "0.1.0.2";
+       sha256 = "1s14dkwvm0ya75z6jqbhy3d8vyfh7dw33d3k9c3xgzwzvznbhq02";
+       libraryHaskellDepends = [
+         base hw-bits hw-excess hw-prim hw-rankselect-base storable-tuple
+         vector
+       ];
+       testHaskellDepends = [
+         base hspec hw-bits hw-prim hw-rankselect-base QuickCheck vector
+       ];
+       benchmarkHaskellDepends = [
+         base criterion hw-bits hw-prim vector
+       ];
+       homepage = "http://github.com/haskell-works/hw-balancedparens#readme";
+       description = "Balanced parentheses";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hw-bits" = callPackage
     ({ mkDerivation, base, bytestring, criterion, hspec, hw-int
      , hw-prim, hw-string-parse, QuickCheck, safe, vector
@@ -106344,6 +107560,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hw-bits_0_5_0_2" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, hspec, hw-int
+     , hw-prim, hw-string-parse, QuickCheck, safe, vector
+     }:
+     mkDerivation {
+       pname = "hw-bits";
+       version = "0.5.0.2";
+       sha256 = "14szmh7wqbwzivc20bmavgcsp286n2kvxxz88qhl4mza5jxi6dhf";
+       libraryHaskellDepends = [
+         base bytestring hw-int hw-prim hw-string-parse safe vector
+       ];
+       testHaskellDepends = [
+         base bytestring hspec hw-prim QuickCheck vector
+       ];
+       benchmarkHaskellDepends = [ base criterion hw-prim vector ];
+       homepage = "http://github.com/haskell-works/hw-bits#readme";
+       description = "Bit manipulation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hw-conduit" = callPackage
     ({ mkDerivation, array, base, bytestring, conduit, criterion, hspec
      , hw-bits, mmap, resourcet, vector, word8
@@ -106368,15 +107605,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hw-conduit_0_2_0_0" = callPackage
+  "hw-conduit_0_2_0_1" = callPackage
     ({ mkDerivation, array, base, bytestring, conduit, criterion, hspec
-     , mmap, vector, word8
+     , mmap, time, vector, word8
      }:
      mkDerivation {
        pname = "hw-conduit";
-       version = "0.2.0.0";
-       sha256 = "17b31pdxisv6ksvha6c5ydv549rjg9xy5q0zch8s5rg3a5f8az3j";
-       libraryHaskellDepends = [ array base bytestring conduit word8 ];
+       version = "0.2.0.1";
+       sha256 = "1zsh8dvafxxrzrgdfa3fl40bzlm6f4isimmmcbgfv3whzxnv15z1";
+       libraryHaskellDepends = [
+         array base bytestring conduit time word8
+       ];
        testHaskellDepends = [ base bytestring conduit hspec ];
        benchmarkHaskellDepends = [
          base bytestring conduit criterion mmap vector
@@ -106439,6 +107678,39 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hw-excess_0_1_0_1" = callPackage
+    ({ mkDerivation, base, hspec, hw-bits, hw-prim, hw-rankselect-base
+     , QuickCheck, safe, vector
+     }:
+     mkDerivation {
+       pname = "hw-excess";
+       version = "0.1.0.1";
+       sha256 = "0q6mrmlii351iji1b0c4j7sck74zgs1hxfyj8cd3k5a6q8j3nkb1";
+       libraryHaskellDepends = [
+         base hw-bits hw-prim hw-rankselect-base safe vector
+       ];
+       testHaskellDepends = [
+         base hspec hw-bits hw-prim QuickCheck vector
+       ];
+       homepage = "http://github.com/haskell-works/hw-excess#readme";
+       description = "Excess";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hw-hspec-hedgehog" = callPackage
+    ({ mkDerivation, base, call-stack, hedgehog, hspec, HUnit }:
+     mkDerivation {
+       pname = "hw-hspec-hedgehog";
+       version = "0.1.0.0";
+       sha256 = "1f1yqcjdn1jbqcpm6qxajqlkirhpyshvy5zi5ccd64anz691dqdw";
+       libraryHaskellDepends = [ base call-stack hedgehog hspec HUnit ];
+       testHaskellDepends = [ base hedgehog hspec ];
+       homepage = "https://github.com/githubuser/hw-hspec-hedgehog#readme";
+       description = "Interoperability between hspec and hedgehog";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hw-int" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -106529,6 +107801,39 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hw-kafka-avro" = callPackage
+    ({ mkDerivation, aeson, avro, base, binary, bytestring, cache
+     , containers, errors, hashable, hspec, http-client, mtl, pure-zlib
+     , QuickCheck, semigroups, servant, servant-client, text
+     , transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "hw-kafka-avro";
+       version = "1.1.0";
+       sha256 = "0srp47c5s295qmf5vjfz4qfs19xn407c58iv51lij674c587vsvb";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson avro base binary bytestring cache containers errors hashable
+         http-client mtl pure-zlib semigroups servant servant-client text
+         transformers unordered-containers
+       ];
+       executableHaskellDepends = [
+         aeson avro base binary bytestring cache containers errors hashable
+         http-client mtl pure-zlib semigroups servant servant-client text
+         transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson avro base binary bytestring cache containers errors hashable
+         hspec http-client mtl pure-zlib QuickCheck semigroups servant
+         servant-client text transformers unordered-containers
+       ];
+       homepage = "https://github.com/haskell-works/hw-kafka-avro#readme";
+       description = "Avro support for Kafka infrastructure";
+       license = stdenv.lib.licenses.bsd3;
+       broken = true;
+     }) {avro = null;};
+
   "hw-kafka-client" = callPackage
     ({ mkDerivation, base, bifunctors, bytestring, c2hs, containers
      , either, hspec, monad-loops, rdkafka, regex-posix, temporary
@@ -106536,8 +107841,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-kafka-client";
-       version = "1.1.2";
-       sha256 = "0y5v1rprysd5d125kxcb2dnc74i647vi1ad94r2iq2m117xrqsnr";
+       version = "1.1.4";
+       sha256 = "1vh3nq6mv8aq5ws17kilkcmdgxg1i1v582ddydrwz3p42kpg1qi4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -106565,8 +107870,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-kafka-conduit";
-       version = "1.1.2";
-       sha256 = "1krvd42qd4l95f69md7122mzqsb1ilj82w742ih2lgp8143na0da";
+       version = "1.1.4";
+       sha256 = "17rmal7kncddyqw7y3sa9kr5frv3gqcr4s85lb8k9iaj64wa2cfl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -106580,8 +107885,8 @@ self: {
          base bifunctors bytestring conduit conduit-extra containers extra
          hspec hw-kafka-client mtl QuickCheck resourcet transformers
        ];
-       homepage = "https://github.com/haskell-works/hw-kafka-client-conduit";
-       description = "Conduit bindings for kafka-client";
+       homepage = "https://github.com/haskell-works/hw-kafka-conduit";
+       description = "Conduit bindings for hw-kafka-client";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -106638,6 +107943,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hw-parser_0_0_0_2" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, hw-prim
+     , mono-traversable, text
+     }:
+     mkDerivation {
+       pname = "hw-parser";
+       version = "0.0.0.2";
+       sha256 = "0c9ns631f3lmar3xqkqk6lgdrfzmpphcray2c32li7n2hj5bcdik";
+       libraryHaskellDepends = [
+         attoparsec base bytestring hw-prim mono-traversable text
+       ];
+       homepage = "http://github.com/haskell-works/hw-parser#readme";
+       description = "Simple parser support";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hw-prim" = callPackage
     ({ mkDerivation, base, bytestring, hspec, QuickCheck, vector }:
      mkDerivation {
@@ -106671,6 +107993,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hw-rankselect_0_8_0_1" = callPackage
+    ({ mkDerivation, base, hspec, hw-balancedparens, hw-bits, hw-prim
+     , hw-rankselect-base, QuickCheck, vector
+     }:
+     mkDerivation {
+       pname = "hw-rankselect";
+       version = "0.8.0.1";
+       sha256 = "1m05w2x5nmja0k1li90vx9ifzs11h8xxbpi25rsk4zalghy8gn6g";
+       libraryHaskellDepends = [
+         base hw-balancedparens hw-bits hw-prim hw-rankselect-base vector
+       ];
+       testHaskellDepends = [
+         base hspec hw-bits hw-prim hw-rankselect-base QuickCheck vector
+       ];
+       homepage = "http://github.com/haskell-works/hw-rankselect#readme";
+       description = "Rank-select";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hw-rankselect-base" = callPackage
     ({ mkDerivation, base, criterion, hspec, hw-bits, hw-int, hw-prim
      , hw-string-parse, QuickCheck, safe, vector
@@ -109576,6 +110918,8 @@ self: {
        pname = "inchworm";
        version = "1.0.2.1";
        sha256 = "19fx9nrx1jia4qz3rhjsdmmmas7bn5rl59b2y2lnzyyz6n83sfzc";
+       revision = "1";
+       editedCabalFile = "0yg8x27fk0kr99ways4h64a5wbxmnh59l8mis9xd0faqx7hadic7";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/DDCSF/inchworm";
        description = "Inchworm Lexer Framework";
@@ -109703,8 +111047,8 @@ self: {
      }:
      mkDerivation {
        pname = "indentation";
-       version = "0.3.1";
-       sha256 = "1lda5zya9nk2sgi074v5j5hj8dr25cayla40mgy3v0pnwgplsdsv";
+       version = "0.3.2";
+       sha256 = "1knazqvr6bk07j7q7835z2d2vs3zyd7i4hzir6aqcdxwhrqm5q7k";
        libraryHaskellDepends = [
          base indentation-core indentation-parsec indentation-trifecta mtl
          parsec parsers trifecta
@@ -109712,6 +111056,7 @@ self: {
        homepage = "https://bitbucket.org/adamsmd/indentation";
        description = "Indentation sensitive parsing combinators for Parsec and Trifecta";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "indentation-core" = callPackage
@@ -109726,6 +111071,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "indentation-core_0_0_0_1" = callPackage
+    ({ mkDerivation, base, mtl }:
+     mkDerivation {
+       pname = "indentation-core";
+       version = "0.0.0.1";
+       sha256 = "136skn3parvsyfii0ywm8cqfmsysi562944fbb0xsgckx0sq1dr1";
+       libraryHaskellDepends = [ base mtl ];
+       homepage = "https://bitbucket.org/adamsmd/indentation";
+       description = "Indentation sensitive parsing combinators core library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "indentation-parsec" = callPackage
     ({ mkDerivation, base, indentation-core, mtl, parsec, tasty
      , tasty-hunit
@@ -109741,14 +111099,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "indentation-parsec_0_0_0_1" = callPackage
+    ({ mkDerivation, base, indentation-core, mtl, parsec, tasty
+     , tasty-hunit
+     }:
+     mkDerivation {
+       pname = "indentation-parsec";
+       version = "0.0.0.1";
+       sha256 = "12s7ic8i7l2g7knzzab0c6k1s59cjlcdsrwygzh8l6l9azvya5lp";
+       libraryHaskellDepends = [ base indentation-core mtl parsec ];
+       testHaskellDepends = [ base parsec tasty tasty-hunit ];
+       homepage = "https://bitbucket.org/adamsmd/indentation";
+       description = "Indentation sensitive parsing combinators for Parsec";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "indentation-trifecta" = callPackage
     ({ mkDerivation, base, indentation-core, mtl, parsers, tasty
      , tasty-hunit, trifecta
      }:
      mkDerivation {
        pname = "indentation-trifecta";
-       version = "0.0.1";
-       sha256 = "1ap6z3gvc93y1bq9msx401bm8wa7js5g5gmzr161bq722rs7y7n7";
+       version = "0.0.2";
+       sha256 = "0d2mxd1cdcr0zfz618dh4grin4z2bjfv4659i2zsddxm9li0dqis";
        libraryHaskellDepends = [
          base indentation-core mtl parsers trifecta
        ];
@@ -109756,6 +111130,7 @@ self: {
        homepage = "https://bitbucket.org/adamsmd/indentation";
        description = "Indentation sensitive parsing combinators for Trifecta";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "indentparser" = callPackage
@@ -110046,9 +111421,9 @@ self: {
   "influxdb" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, clock
      , containers, foldl, http-client, http-types, HUnit, lens, mtl
-     , network, optional-args, scientific, tasty, tasty-hunit
-     , tasty-quickcheck, tasty-th, text, time, unordered-containers
-     , vector
+     , mwc-random, network, optional-args, scientific, tasty
+     , tasty-hunit, tasty-quickcheck, tasty-th, text, time
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "influxdb";
@@ -110061,6 +111436,10 @@ self: {
          http-types lens network optional-args scientific text time
          unordered-containers vector
        ];
+       executableHaskellDepends = [
+         aeson base bytestring containers foldl http-client lens mwc-random
+         network optional-args text time vector
+       ];
        testHaskellDepends = [
          base http-client HUnit mtl tasty tasty-hunit tasty-quickcheck
          tasty-th text vector
@@ -110208,6 +111587,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {inherit (pkgs) gsl; gslcblas = null;};
 
+  "inline-c_0_6_0_2" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring
+     , containers, cryptohash, gsl, gslcblas, hashable, hspec, mtl
+     , parsec, parsers, QuickCheck, raw-strings-qq, regex-posix
+     , template-haskell, transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "inline-c";
+       version = "0.6.0.2";
+       sha256 = "0myrr8fh42ydzwkyw2mipa5g7hzr6lb593dl95vkika8v3nr2srk";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-wl-pprint base binary bytestring containers cryptohash
+         hashable mtl parsec parsers QuickCheck template-haskell
+         transformers unordered-containers vector
+       ];
+       executableSystemDepends = [ gsl gslcblas ];
+       testHaskellDepends = [
+         ansi-wl-pprint base containers hashable hspec parsers QuickCheck
+         raw-strings-qq regex-posix template-haskell transformers
+         unordered-containers vector
+       ];
+       description = "Write Haskell source files including C code inline. No FFI required.";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) gsl; gslcblas = null;};
+
   "inline-c-cpp" = callPackage
     ({ mkDerivation, base, inline-c, template-haskell }:
      mkDerivation {
@@ -110220,6 +111627,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "inline-c-cpp_0_2_0_2" = callPackage
+    ({ mkDerivation, base, inline-c, template-haskell }:
+     mkDerivation {
+       pname = "inline-c-cpp";
+       version = "0.2.0.2";
+       sha256 = "1zmqj47snxa0hxw3scz2mqgb1axfwqya5n1hi72x7abcx0nzfc2q";
+       libraryHaskellDepends = [ base inline-c template-haskell ];
+       testHaskellDepends = [ base ];
+       description = "Lets you embed C++ code into Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "inline-c-win32" = callPackage
     ({ mkDerivation, base, containers, inline-c, template-haskell
      , Win32
@@ -110340,7 +111760,7 @@ self: {
          lucid-extras plotlyhs text time
        ];
        executableHaskellDepends = [ base text ];
-       testHaskellDepends = [ base text ];
+       testHaskellDepends = [ base text time ];
        homepage = "https://github.com/diffusionkinetics/open/inliterate";
        description = "Interactive literate programming";
        license = stdenv.lib.licenses.mit;
@@ -111193,12 +112613,21 @@ self: {
      }) {};
 
   "intset" = callPackage
-    ({ mkDerivation, base, bits-extras, bytestring, deepseq }:
+    ({ mkDerivation, base, bits-extras, bytestring, containers
+     , criterion, deepseq, QuickCheck, test-framework
+     , test-framework-quickcheck2
+     }:
      mkDerivation {
        pname = "intset";
        version = "0.1.1.0";
        sha256 = "044nw8z2ga46mal9pr64vsc714n4dibx0k2lwgnrkk49729c7lk0";
        libraryHaskellDepends = [ base bits-extras bytestring deepseq ];
+       testHaskellDepends = [
+         base QuickCheck test-framework test-framework-quickcheck2
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring containers criterion deepseq
+       ];
        homepage = "https://github.com/pxqr/intset";
        description = "Pure, mergeable, succinct Int sets";
        license = stdenv.lib.licenses.bsd3;
@@ -111808,7 +113237,7 @@ self: {
 
   "ipython-kernel" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cereal, containers
-     , directory, filepath, mtl, process, SHA, temporary, text
+     , directory, filepath, mtl, parsec, process, SHA, temporary, text
      , transformers, unordered-containers, uuid, zeromq4-haskell
      }:
      mkDerivation {
@@ -111822,6 +113251,9 @@ self: {
          process SHA temporary text transformers unordered-containers uuid
          zeromq4-haskell
        ];
+       executableHaskellDepends = [
+         base filepath mtl parsec text transformers
+       ];
        homepage = "http://github.com/gibiansky/IHaskell";
        description = "A library for creating kernels for IPython frontends";
        license = stdenv.lib.licenses.mit;
@@ -111876,6 +113308,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "irc-client_0_4_4_2" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, connection, irc-conduit
+     , irc-ctcp, network-conduit-tls, old-locale, stm, stm-conduit, text
+     , time, tls, transformers, x509, x509-store, x509-validation
+     }:
+     mkDerivation {
+       pname = "irc-client";
+       version = "0.4.4.2";
+       sha256 = "07rijsr4sbh9hsj83kazgxrwl7vamxa3d6hd71bdsq485ghkkphq";
+       libraryHaskellDepends = [
+         base bytestring conduit connection irc-conduit irc-ctcp
+         network-conduit-tls old-locale stm stm-conduit text time tls
+         transformers x509 x509-store x509-validation
+       ];
+       homepage = "https://github.com/barrucadu/irc-client";
+       description = "An IRC client library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "irc-colors" = callPackage
     ({ mkDerivation, base, text }:
      mkDerivation {
@@ -112546,6 +113998,7 @@ self: {
        libraryHaskellDepends = [
          base bytestring containers ListLike MonadCatchIO-mtl mtl unix
        ];
+       executableHaskellDepends = [ base ];
        homepage = "http://inmachina.net/~jwlato/haskell/iteratee";
        description = "Iteratee-based I/O";
        license = stdenv.lib.licenses.bsd3;
@@ -114012,8 +115465,9 @@ self: {
      }) {};
 
   "jsc" = callPackage
-    ({ mkDerivation, base, jmacro, lens, template-haskell, text
-     , transformers, webkitgtk3, webkitgtk3-javascriptcore
+    ({ mkDerivation, base, glib, gtk3, hslogger, jmacro, lens
+     , template-haskell, text, transformers, webkitgtk3
+     , webkitgtk3-javascriptcore
      }:
      mkDerivation {
        pname = "jsc";
@@ -114023,6 +115477,10 @@ self: {
          base jmacro lens template-haskell text transformers webkitgtk3
          webkitgtk3-javascriptcore
        ];
+       testHaskellDepends = [
+         base glib gtk3 hslogger jmacro lens template-haskell text
+         transformers webkitgtk3 webkitgtk3-javascriptcore
+       ];
        description = "High level interface for webkit-javascriptcore";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -114679,8 +116137,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-tracer";
-       version = "0.0.1.2";
-       sha256 = "1687zjhc5d63qq7kzkq4kcn9qw9kwlb566kgfkh7yr8whp5rhgnd";
+       version = "0.0.2.0";
+       sha256 = "0fgyx2m0xnkwkqlvmbqmwjklfdif8gprz1bcwbcmmvyznsc6wngq";
        libraryHaskellDepends = [
          aeson base containers ghc-prim hashable microlens microlens-ghc mtl
          template-haskell text transformers unordered-containers
@@ -115208,8 +116666,9 @@ self: {
      }) {};
 
   "kafka-client" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, digest, dlist, hspec
-     , hspec-discover, network, QuickCheck, snappy, time, zlib
+    ({ mkDerivation, base, bytestring, cereal, containers, digest
+     , dlist, hspec, hspec-discover, network, process, QuickCheck
+     , snappy, temporary, time, zlib
      }:
      mkDerivation {
        pname = "kafka-client";
@@ -115219,7 +116678,8 @@ self: {
          base bytestring cereal digest dlist network snappy time zlib
        ];
        testHaskellDepends = [
-         base bytestring cereal hspec hspec-discover QuickCheck time
+         base bytestring cereal containers hspec hspec-discover network
+         process QuickCheck temporary time
        ];
        homepage = "https://github.com/abhinav/kafka-client";
        description = "Low-level Haskell client library for Apache Kafka 0.7.";
@@ -115472,6 +116932,7 @@ self: {
          directory dotgen filepath netlist netlist-to-vhdl process random
          sized-types strict template-haskell
        ];
+       executableHaskellDepends = [ base ];
        homepage = "http://ittc.ku.edu/csdl/fpg/Tools/KansasLava";
        description = "Kansas Lava is a hardware simulator and VHDL generator";
        license = stdenv.lib.licenses.bsd3;
@@ -115492,6 +116953,7 @@ self: {
          ansi-terminal base bytestring data-default directory filepath
          kansas-lava network sized-types
        ];
+       executableHaskellDepends = [ base ];
        homepage = "http://ittc.ku.edu/csdl/fpg/Tools/KansasLava";
        description = "FPGA Cores Written in Kansas Lava";
        license = stdenv.lib.licenses.bsd3;
@@ -115628,35 +117090,36 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "katip_0_4_1_0" = callPackage
+  "katip_0_5_0_0" = callPackage
     ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
      , bytestring, containers, criterion, deepseq, directory, either
-     , exceptions, hostname, microlens, microlens-th, monad-control, mtl
+     , filepath, hostname, microlens, microlens-th, monad-control, mtl
      , old-locale, quickcheck-instances, regex-tdfa, resourcet
-     , semigroups, string-conv, tasty, tasty-golden, tasty-hunit
-     , tasty-quickcheck, template-haskell, text, time
-     , time-locale-compat, transformers, transformers-base
-     , transformers-compat, unagi-chan, unix, unordered-containers
+     , safe-exceptions, semigroups, stm, string-conv, tasty
+     , tasty-golden, tasty-hunit, tasty-quickcheck, template-haskell
+     , text, time, time-locale-compat, transformers, transformers-base
+     , transformers-compat, unix, unordered-containers
      }:
      mkDerivation {
        pname = "katip";
-       version = "0.4.1.0";
-       sha256 = "0rhnp6qg19v180nazwghn2f4chc79fwn1g74wr3zdsqg0j211bnp";
+       version = "0.5.0.0";
+       sha256 = "0wqf5d4hjy6mc050g7hl2m3b66pi3fhyy37w0jwm7q7rrcplyncc";
        libraryHaskellDepends = [
-         aeson async auto-update base bytestring containers either
-         exceptions hostname microlens microlens-th monad-control mtl
-         old-locale resourcet semigroups string-conv template-haskell text
-         time transformers transformers-base transformers-compat unagi-chan
-         unix unordered-containers
+         aeson async auto-update base bytestring containers either hostname
+         microlens microlens-th monad-control mtl old-locale resourcet
+         safe-exceptions semigroups stm string-conv template-haskell text
+         time transformers transformers-base transformers-compat unix
+         unordered-containers
        ];
        testHaskellDepends = [
-         aeson base bytestring directory microlens quickcheck-instances
-         regex-tdfa tasty tasty-golden tasty-hunit tasty-quickcheck
-         template-haskell text time time-locale-compat unordered-containers
+         aeson base bytestring containers directory microlens
+         quickcheck-instances regex-tdfa safe-exceptions stm tasty
+         tasty-golden tasty-hunit tasty-quickcheck template-haskell text
+         time time-locale-compat unordered-containers
        ];
        benchmarkHaskellDepends = [
-         aeson async base blaze-builder criterion deepseq text time
-         transformers unix
+         aeson async base blaze-builder criterion deepseq directory filepath
+         safe-exceptions text time transformers unix
        ];
        homepage = "https://github.com/Soostone/katip";
        description = "A structured logging framework";
@@ -115695,6 +117158,38 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "katip-elasticsearch_0_4_0_0" = callPackage
+    ({ mkDerivation, aeson, async, base, bloodhound, bytestring
+     , containers, criterion, deepseq, enclosed-exceptions, exceptions
+     , http-client, http-types, katip, lens, lens-aeson
+     , quickcheck-instances, retry, rng-utils, scientific, stm
+     , stm-chans, tagged, tasty, tasty-hunit, tasty-quickcheck, text
+     , time, transformers, unordered-containers, uuid, vector
+     }:
+     mkDerivation {
+       pname = "katip-elasticsearch";
+       version = "0.4.0.0";
+       sha256 = "0ypss3ga6xcqwd03y3jbq9mi6ka4h6srlr7ybb8k38bk9ql0bfld";
+       libraryHaskellDepends = [
+         aeson async base bloodhound bytestring enclosed-exceptions
+         exceptions http-client http-types katip retry scientific stm
+         stm-chans text time transformers unordered-containers uuid
+       ];
+       testHaskellDepends = [
+         aeson base bloodhound bytestring containers http-client http-types
+         katip lens lens-aeson quickcheck-instances scientific stm tagged
+         tasty tasty-hunit tasty-quickcheck text time transformers
+         unordered-containers vector
+       ];
+       benchmarkHaskellDepends = [
+         aeson base bloodhound criterion deepseq rng-utils text
+         unordered-containers uuid
+       ];
+       description = "ElasticSearch scribe for the Katip logging framework";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "katt" = callPackage
     ({ mkDerivation, aeson, base, bytestring, ConfigFile, containers
      , directory, errors, filepath, lens, mtl, parsec, text, url, wreq
@@ -116367,6 +117862,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base udbus ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/lunaryorn/haskell-keyring";
        description = "Keyring access";
        license = stdenv.lib.licenses.mit;
@@ -117724,10 +119220,12 @@ self: {
      }) {};
 
   "lambdacube-compiler" = callPackage
-    ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring
-     , containers, directory, exceptions, filepath, lambdacube-ir
-     , megaparsec, mtl, optparse-applicative, pretty-show, semigroups
-     , text, vector
+    ({ mkDerivation, aeson, ansi-wl-pprint, async, base
+     , base64-bytestring, bytestring, containers, deepseq, directory
+     , exceptions, filepath, JuicyPixels, lambdacube-ir, megaparsec
+     , monad-control, mtl, optparse-applicative, patience, pretty-show
+     , process, QuickCheck, semigroups, tasty, tasty-quickcheck, text
+     , time, vect, vector, websockets
      }:
      mkDerivation {
        pname = "lambdacube-compiler";
@@ -117740,7 +119238,11 @@ self: {
          lambdacube-ir megaparsec mtl pretty-show semigroups text vector
        ];
        executableHaskellDepends = [
-         aeson base bytestring filepath optparse-applicative
+         aeson ansi-wl-pprint async base base64-bytestring bytestring
+         containers deepseq directory exceptions filepath JuicyPixels
+         lambdacube-ir megaparsec monad-control mtl optparse-applicative
+         patience pretty-show process QuickCheck semigroups tasty
+         tasty-quickcheck text time vect vector websockets
        ];
        homepage = "http://lambdacube3d.com";
        description = "LambdaCube 3D is a DSL to program GPUs";
@@ -117822,8 +119324,10 @@ self: {
      }) {};
 
   "lambdacube-gl" = callPackage
-    ({ mkDerivation, base, bytestring, containers, JuicyPixels
-     , lambdacube-ir, mtl, OpenGLRaw, vector, vector-algorithms
+    ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+     , containers, exceptions, GLFW-b, JuicyPixels, lambdacube-ir, mtl
+     , network, OpenGLRaw, text, time, vector, vector-algorithms
+     , wavefront, websockets
      }:
      mkDerivation {
        pname = "lambdacube-gl";
@@ -117835,6 +119339,11 @@ self: {
          base bytestring containers JuicyPixels lambdacube-ir mtl OpenGLRaw
          vector vector-algorithms
        ];
+       executableHaskellDepends = [
+         aeson base base64-bytestring bytestring containers exceptions
+         GLFW-b JuicyPixels lambdacube-ir mtl network OpenGLRaw text time
+         vector wavefront websockets
+       ];
        homepage = "http://lambdacube3d.com";
        description = "OpenGL 3.3 Core Profile backend for LambdaCube 3D";
        license = stdenv.lib.licenses.bsd3;
@@ -118034,8 +119543,9 @@ self: {
      }) {};
 
   "language-boogie" = callPackage
-    ({ mkDerivation, ansi-terminal, base, cmdargs, containers, lens
-     , mtl, parsec, pretty, random, stream-monad, time, transformers
+    ({ mkDerivation, ansi-terminal, base, cmdargs, containers, filepath
+     , HUnit, lens, mtl, parsec, pretty, random, stream-monad, time
+     , transformers
      }:
      mkDerivation {
        pname = "language-boogie";
@@ -118048,8 +119558,8 @@ self: {
          transformers
        ];
        executableHaskellDepends = [
-         ansi-terminal base cmdargs containers lens mtl parsec pretty random
-         stream-monad time transformers
+         ansi-terminal base cmdargs containers filepath HUnit lens mtl
+         parsec pretty random stream-monad time transformers
        ];
        homepage = "https://bitbucket.org/nadiapolikarpova/boogaloo";
        description = "Interpreter and language infrastructure for Boogie";
@@ -118121,6 +119631,7 @@ self: {
          array base containers filepath language-c-quote mainland-pretty
          template-haskell
        ];
+       testHaskellDepends = [ base language-c-quote ];
        homepage = "https://github.com/mchakravarty/language-c-inline/";
        description = "Inline C & Objective-C code in Haskell for language interoperability";
        license = stdenv.lib.licenses.bsd3;
@@ -118154,7 +119665,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "language-c-quote_0_12" = callPackage
+  "language-c-quote_0_12_1" = callPackage
     ({ mkDerivation, alex, array, base, bytestring, containers
      , exception-mtl, exception-transformers, filepath, happy
      , haskell-src-meta, HUnit, mainland-pretty, mtl, srcloc, syb
@@ -118162,8 +119673,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-c-quote";
-       version = "0.12";
-       sha256 = "14wxbis9zm3zlc3q430is50nk5k2hqx4lracwm2ca7qlg854h2hj";
+       version = "0.12.1";
+       sha256 = "111mvmbr9m8np5zayj95mv8bjcrgwjafq4lskq5qjs20fvskfdgc";
        libraryHaskellDepends = [
          array base bytestring containers exception-mtl
          exception-transformers filepath haskell-src-meta mainland-pretty
@@ -118193,9 +119704,10 @@ self: {
      }) {};
 
   "language-conf" = callPackage
-    ({ mkDerivation, aeson, base, deepseq, directory, filepath, hspec
-     , hspec-megaparsec, megaparsec, pretty, QuickCheck, scientific
-     , semigroups, text, transformers, unordered-containers, vector
+    ({ mkDerivation, aeson, base, bytestring, deepseq, directory
+     , filepath, hspec, hspec-megaparsec, megaparsec
+     , optparse-applicative, pretty, QuickCheck, scientific, semigroups
+     , text, transformers, unordered-containers, vector, yaml
      }:
      mkDerivation {
        pname = "language-conf";
@@ -118207,6 +119719,10 @@ self: {
          aeson base deepseq directory filepath megaparsec pretty scientific
          semigroups text unordered-containers vector
        ];
+       executableHaskellDepends = [
+         aeson base bytestring filepath megaparsec optparse-applicative
+         pretty text yaml
+       ];
        testHaskellDepends = [
          aeson base directory filepath hspec hspec-megaparsec megaparsec
          pretty QuickCheck semigroups text transformers
@@ -118259,6 +119775,11 @@ self: {
          pretty ShellCheck split template-haskell text th-lift
          th-lift-instances transformers unordered-containers yaml
        ];
+       executableHaskellDepends = [
+         aeson base bytestring directory filepath free Glob mtl parsec
+         pretty ShellCheck split template-haskell text th-lift
+         th-lift-instances transformers unordered-containers yaml
+       ];
        testHaskellDepends = [
          aeson base bytestring directory filepath free Glob hspec HUnit mtl
          parsec pretty process QuickCheck ShellCheck split template-haskell
@@ -118598,9 +120119,9 @@ self: {
 
   "language-lua2" = callPackage
     ({ mkDerivation, base, containers, deepseq, Earley
-     , lexer-applicative, microlens, QuickCheck, regex-applicative
-     , semigroups, srcloc, tasty, tasty-hunit, tasty-quickcheck
-     , transformers, unordered-containers, wl-pprint
+     , lexer-applicative, microlens, optparse-applicative, QuickCheck
+     , regex-applicative, semigroups, srcloc, tasty, tasty-hunit
+     , tasty-quickcheck, transformers, unordered-containers, wl-pprint
      }:
      mkDerivation {
        pname = "language-lua2";
@@ -118613,6 +120134,9 @@ self: {
          regex-applicative semigroups srcloc transformers
          unordered-containers wl-pprint
        ];
+       executableHaskellDepends = [
+         base Earley lexer-applicative optparse-applicative srcloc wl-pprint
+       ];
        testHaskellDepends = [
          base deepseq lexer-applicative QuickCheck semigroups srcloc tasty
          tasty-hunit tasty-quickcheck unordered-containers
@@ -118639,6 +120163,46 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "language-ninja" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, Cabal
+     , cabal-doctest, containers, deepseq, doctest, flow, ghc
+     , haddock-api, haddock-library, hashable, intern, lens, megaparsec
+     , monad-mock, mtl, optparse-generic, QuickCheck
+     , quickcheck-instances, smallcheck, system-filepath, tasty
+     , tasty-html, tasty-hunit, tasty-lens, tasty-quickcheck
+     , tasty-smallcheck, template-haskell, text, transformers, turtle
+     , unordered-containers, versions
+     }:
+     mkDerivation {
+       pname = "language-ninja";
+       version = "0.1.0";
+       sha256 = "1bqf61q8mzglf1f3y2khy2vw4k3kfc0qd0rw984jyfxk10wqr27d";
+       isLibrary = true;
+       isExecutable = true;
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         aeson base bytestring containers deepseq flow hashable intern lens
+         megaparsec mtl QuickCheck quickcheck-instances smallcheck
+         system-filepath text transformers unordered-containers versions
+       ];
+       executableHaskellDepends = [
+         aeson aeson-pretty base flow lens mtl optparse-generic text
+         transformers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring cabal-doctest containers doctest flow ghc
+         haddock-api haddock-library hashable lens monad-mock mtl QuickCheck
+         quickcheck-instances smallcheck system-filepath tasty tasty-html
+         tasty-hunit tasty-lens tasty-quickcheck tasty-smallcheck
+         template-haskell text transformers turtle unordered-containers
+         versions
+       ];
+       homepage = "https://github.com/awakesecurity/language-ninja";
+       description = "A library for dealing with the Ninja build language";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "language-nix" = callPackage
     ({ mkDerivation, base, base-compat, Cabal, deepseq, doctest, lens
      , pretty, QuickCheck
@@ -118760,6 +120324,50 @@ self: {
        hydraPlatforms = [ "x86_64-linux" ];
      }) {};
 
+  "language-puppet_1_3_8_1" = callPackage
+    ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
+     , base16-bytestring, bytestring, case-insensitive, containers
+     , cryptonite, directory, either, exceptions, filecache, formatting
+     , Glob, hashable, hruby, hslogger, hspec, hspec-megaparsec
+     , http-api-data, http-client, HUnit, lens, lens-aeson, megaparsec
+     , memory, mtl, operational, optparse-applicative, parallel-io
+     , parsec, pcre-utils, process, random, regex-pcre-builtin
+     , scientific, semigroups, servant, servant-client, split, stm
+     , strict-base-types, temporary, text, time, transformers, unix
+     , unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "language-puppet";
+       version = "1.3.8.1";
+       sha256 = "0hk1fx574hkmm275rm4jv66vr9gixllaw2vqklhpx54rgjwpcclv";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring
+         case-insensitive containers cryptonite directory either exceptions
+         filecache formatting hashable hruby hslogger hspec http-api-data
+         http-client lens lens-aeson megaparsec memory mtl operational
+         parsec pcre-utils process random regex-pcre-builtin scientific
+         semigroups servant servant-client split stm strict-base-types text
+         time transformers unix unordered-containers vector yaml
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring containers Glob hslogger http-client lens
+         megaparsec mtl optparse-applicative parallel-io regex-pcre-builtin
+         servant-client strict-base-types text transformers
+         unordered-containers vector yaml
+       ];
+       testHaskellDepends = [
+         ansi-wl-pprint base Glob hslogger hspec hspec-megaparsec HUnit lens
+         megaparsec mtl scientific strict-base-types temporary text
+         transformers unix unordered-containers vector
+       ];
+       homepage = "http://lpuppet.banquise.net/";
+       description = "Tools to parse and evaluate the Puppet DSL";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "language-python" = callPackage
     ({ mkDerivation, alex, array, base, containers, happy, monads-tf
      , pretty, transformers, utf8-string
@@ -119333,6 +120941,40 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lazy-hash" = callPackage
+    ({ mkDerivation, base, constrained-categories, hashable
+     , haskell-src-meta, tagged, template-haskell, vector-space
+     }:
+     mkDerivation {
+       pname = "lazy-hash";
+       version = "0.1.0.0";
+       sha256 = "1xa2c8gxk5l4njbs58zpq2ybdvjd4y214p71nfmfrzw0arwz49pa";
+       libraryHaskellDepends = [
+         base constrained-categories hashable haskell-src-meta tagged
+         template-haskell vector-space
+       ];
+       description = "Identifiers for not-yet-computed values";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
+  "lazy-hash-cache" = callPackage
+    ({ mkDerivation, base, base16-bytestring, binary, bytestring
+     , data-default-class, directory, filepath, hashable, lazy-hash
+     , microlens, microlens-th, temporary
+     }:
+     mkDerivation {
+       pname = "lazy-hash-cache";
+       version = "0.1.0.0";
+       sha256 = "1bdq2fbxpmlva1qbxbiznnjmz7yv7qzcr8wdgds0rdzwhjn97mp4";
+       libraryHaskellDepends = [
+         base base16-bytestring binary bytestring data-default-class
+         directory filepath hashable lazy-hash microlens microlens-th
+         temporary
+       ];
+       description = "Storing computed values for re-use when the same program runs again";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "lazy-io" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -119606,8 +121248,8 @@ self: {
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "leancheck";
-       version = "0.6.2";
-       sha256 = "0xqkf9ijghbcdypsdfd4ji9aqh43sq736db49y0kilw2hfqxj8pl";
+       version = "0.6.3";
+       sha256 = "0qcmpm7x5fsiqvwnsih2xqy9liy23vv96i88460kjr19lvscglhj";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/rudymatela/leancheck#readme";
@@ -120388,7 +122030,7 @@ self: {
      }) {};
 
   "leveldb-haskell" = callPackage
-    ({ mkDerivation, base, bytestring, data-default, directory
+    ({ mkDerivation, async, base, bytestring, data-default, directory
      , exceptions, filepath, leveldb, mtl, QuickCheck, resourcet, tasty
      , tasty-quickcheck, temporary, transformers
      }:
@@ -120403,6 +122045,9 @@ self: {
          transformers
        ];
        librarySystemDepends = [ leveldb ];
+       executableHaskellDepends = [
+         async base bytestring data-default resourcet transformers
+       ];
        testHaskellDepends = [
          base bytestring data-default directory exceptions mtl QuickCheck
          tasty tasty-quickcheck temporary transformers
@@ -120413,9 +122058,9 @@ self: {
      }) {inherit (pkgs) leveldb;};
 
   "leveldb-haskell-fork" = callPackage
-    ({ mkDerivation, base, bytestring, data-default, filepath, hspec
-     , hspec-expectations, leveldb, mtl, process, QuickCheck, resourcet
-     , transformers
+    ({ mkDerivation, async, base, bytestring, data-default, filepath
+     , hspec, hspec-expectations, leveldb, mtl, process, QuickCheck
+     , resourcet, transformers
      }:
      mkDerivation {
        pname = "leveldb-haskell-fork";
@@ -120427,6 +122072,9 @@ self: {
          base bytestring data-default filepath resourcet transformers
        ];
        librarySystemDepends = [ leveldb ];
+       executableHaskellDepends = [
+         async base bytestring data-default resourcet transformers
+       ];
        testHaskellDepends = [
          base bytestring data-default hspec hspec-expectations mtl process
          QuickCheck transformers
@@ -120451,7 +122099,8 @@ self: {
      }) {};
 
   "levmar-chart" = callPackage
-    ({ mkDerivation, base, Chart, colour, data-accessor, levmar }:
+    ({ mkDerivation, base, Chart, colour, data-accessor, levmar, random
+     }:
      mkDerivation {
        pname = "levmar-chart";
        version = "0.2";
@@ -120459,6 +122108,9 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base Chart colour data-accessor levmar ];
+       executableHaskellDepends = [
+         base Chart colour data-accessor levmar random
+       ];
        description = "Plots the results of the Levenberg-Marquardt algorithm in a chart";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -120558,13 +122210,26 @@ self: {
      }) {};
 
   "lhc" = callPackage
-    ({ mkDerivation }:
+    ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring
+     , bytestring-trie, Cabal, containers, core, derive, digest
+     , directory, extensible-exceptions, filepath, haskell98, HUnit, mtl
+     , parallel, pretty, process, QuickCheck, test-framework
+     , test-framework-hunit, test-framework-quickcheck, time, unix
+     , xhtml
+     }:
      mkDerivation {
        pname = "lhc";
        version = "0.10";
        sha256 = "1x50k6lx9p36qxl0qn9zfyqlkgsq3wdzvcv7l6sn920hg5scvcr3";
        isLibrary = false;
        isExecutable = true;
+       executableHaskellDepends = [
+         ansi-wl-pprint base binary bytestring bytestring-trie Cabal
+         containers core derive digest directory extensible-exceptions
+         filepath haskell98 HUnit mtl parallel pretty process QuickCheck
+         test-framework test-framework-hunit test-framework-quickcheck time
+         unix xhtml
+       ];
        homepage = "http://lhc.seize.it/";
        description = "LHC Haskell Compiler";
        license = stdenv.lib.licenses.publicDomain;
@@ -120855,8 +122520,8 @@ self: {
   "liblastfm" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cereal, containers
      , cryptonite, hspec, hspec-expectations-lens, http-client
-     , http-client-tls, lens, lens-aeson, network-uri, profunctors
-     , semigroups, text, transformers, xml-conduit
+     , http-client-tls, HUnit, lens, lens-aeson, network-uri
+     , profunctors, semigroups, text, transformers, xml-conduit
      , xml-html-conduit-lens
      }:
      mkDerivation {
@@ -120870,8 +122535,8 @@ self: {
        ];
        testHaskellDepends = [
          aeson base bytestring cereal containers cryptonite hspec
-         hspec-expectations-lens http-client http-client-tls lens lens-aeson
-         network-uri profunctors text transformers xml-conduit
+         hspec-expectations-lens http-client http-client-tls HUnit lens
+         lens-aeson network-uri profunctors text transformers xml-conduit
          xml-html-conduit-lens
        ];
        description = "Lastfm API interface";
@@ -120940,6 +122605,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/mainland/libltdl";
        description = "FFI interface to libltdl";
        license = stdenv.lib.licenses.bsd3;
@@ -121238,6 +122904,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {systemd = null;};
 
+  "libsystemd-journal_1_4_2" = callPackage
+    ({ mkDerivation, base, bytestring, hashable, hsyslog, pipes
+     , pipes-safe, systemd, text, transformers, uniplate
+     , unix-bytestring, unordered-containers, uuid, vector
+     }:
+     mkDerivation {
+       pname = "libsystemd-journal";
+       version = "1.4.2";
+       sha256 = "0pdb4spffm4q7xxc3nd8zn4y91v5cf4xmdgb4zls3nnh579h1ygk";
+       libraryHaskellDepends = [
+         base bytestring hashable hsyslog pipes pipes-safe text transformers
+         uniplate unix-bytestring unordered-containers uuid vector
+       ];
+       libraryPkgconfigDepends = [ systemd ];
+       homepage = "http://github.com/ocharles/libsystemd-journal";
+       description = "Haskell bindings to libsystemd-journal";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {systemd = null;};
+
   "libtagc" = callPackage
     ({ mkDerivation, base, bytestring, glib, taglib }:
      mkDerivation {
@@ -121388,6 +123074,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "licensor_0_2_1" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, cmdargs, containers
+     , directory, http-conduit, process
+     }:
+     mkDerivation {
+       pname = "licensor";
+       version = "0.2.1";
+       sha256 = "1is281xsrfdh2vsank07j1gw634iadz0sp8ssabpfqgnb3a98rvz";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring Cabal containers directory http-conduit process
+       ];
+       executableHaskellDepends = [
+         base Cabal cmdargs containers directory
+       ];
+       homepage = "https://github.com/jpvillaisaza/licensor";
+       description = "A license compatibility helper";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "life" = callPackage
     ({ mkDerivation, array, base, GLUT, OpenGL, random }:
      mkDerivation {
@@ -121559,7 +123267,8 @@ self: {
          transformers
        ];
        testHaskellDepends = [
-         aeson api-builder base bytestring hspec text transformers
+         aeson api-builder base bytestring hspec http-client http-client-tls
+         http-types network text transformers
        ];
        homepage = "https://github.com/cmoresid/lightning-haskell#readme";
        description = "Haskell client for lightning-viz REST API";
@@ -122547,8 +124256,8 @@ self: {
      }:
      mkDerivation {
        pname = "liquidhaskell";
-       version = "0.8.0.0";
-       sha256 = "1jwh46z9d7ll380fygdk90zic9br723aag82w1cgllc1r5m8kqib";
+       version = "0.8.0.1";
+       sha256 = "1rj6c46laylds149d11yyw79vn0nls9gmxnc9fakyl4qg0d97d75";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -122676,6 +124385,9 @@ self: {
        libraryHaskellDepends = [
          ansi-terminal base data-default stm terminal-size vty
        ];
+       executableHaskellDepends = [
+         ansi-terminal base data-default stm terminal-size vty
+       ];
        testHaskellDepends = [
          ansi-terminal base data-default hspec stm terminal-size vty
        ];
@@ -123400,9 +125112,10 @@ self: {
      }) {};
 
   "llvm-pretty-bc-parser" = callPackage
-    ({ mkDerivation, array, base, bytestring, cereal, containers
-     , directory, fgl, fgl-visualize, filepath, llvm-pretty, monadLib
-     , pretty, process
+    ({ mkDerivation, abstract-par, array, base, bytestring, cereal
+     , containers, deepseq, directory, fgl, fgl-visualize, filepath
+     , llvm-pretty, monad-par, monadLib, pretty, process, random
+     , temporary, time, transformers, xml
      }:
      mkDerivation {
        pname = "llvm-pretty-bc-parser";
@@ -123415,8 +125128,9 @@ self: {
          pretty
        ];
        executableHaskellDepends = [
-         array base bytestring cereal containers fgl fgl-visualize
-         llvm-pretty monadLib pretty
+         abstract-par array base bytestring cereal containers deepseq
+         directory fgl fgl-visualize filepath llvm-pretty monad-par monadLib
+         pretty process random temporary time transformers xml
        ];
        testHaskellDepends = [
          base bytestring directory filepath llvm-pretty process
@@ -123588,8 +125302,8 @@ self: {
     ({ mkDerivation, base, containers, doctest, hedgehog, loc-test }:
      mkDerivation {
        pname = "loc";
-       version = "0.1.2.3";
-       sha256 = "064q3hyjnfpa2r2290604m9pcgh9l1g9fbap176d3n7xknn3lvcc";
+       version = "0.1.3.0";
+       sha256 = "09s0a8diav2gyva965m03z1j7dcb7r1r6y10c8c3n1qpqvmgmvym";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers doctest hedgehog loc-test ];
        homepage = "https://github.com/chris-martin/haskell-libraries";
@@ -123601,8 +125315,8 @@ self: {
     ({ mkDerivation, base, containers, hedgehog, loc }:
      mkDerivation {
        pname = "loc-test";
-       version = "0.1.2.1";
-       sha256 = "0l75qvhxhppg2vw90fx5g6rg98zy83dx0hd2v9ad799fp4mk6qai";
+       version = "0.1.3.0";
+       sha256 = "1ic60m2slsaqyd0k82hbm5pb58z15zlhy429hzaj40bj1yjblwyw";
        libraryHaskellDepends = [ base containers hedgehog loc ];
        homepage = "https://github.com/chris-martin/haskell-libraries";
        description = "Test-related utilities related to the /loc/ package";
@@ -123654,8 +125368,8 @@ self: {
     ({ mkDerivation, base, criterion }:
      mkDerivation {
        pname = "located-base";
-       version = "0.1.1.0";
-       sha256 = "17ym69bxjic63mj5g37ycp9vw7vy9x000wmddc5q5jbyr20n1ac3";
+       version = "0.1.1.1";
+       sha256 = "1f8k78p7nx7dbrjrkx6ff8d02a0zspg1pc1y3whqbxrhm0ynl1ay";
        libraryHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base criterion ];
        homepage = "http://github.com/gridaphobe/located-base";
@@ -123972,20 +125686,20 @@ self: {
   "log-utils" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cmdargs, data-default
      , exceptions, hpqtypes, http-types, invariant, kontra-config
-     , lifted-base, log, monad-control, random, text, time, transformers
-     , transformers-base, unjson, vector, wai, warp
+     , lifted-base, log-base, monad-control, random, text, time
+     , transformers, transformers-base, unjson, vector, wai, warp
      }:
      mkDerivation {
        pname = "log-utils";
-       version = "0.2.2";
-       sha256 = "121nxm72jxixq71dm4yg6l896inhw97c6j7kdczv7svdqr827qbz";
+       version = "0.2.2.1";
+       sha256 = "151dgpkcc0hmsjw3vw13zzgqlww1mzh61k87hksfcd7dqvgcvmkj";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          aeson base bytestring cmdargs data-default exceptions hpqtypes
-         http-types invariant kontra-config lifted-base log monad-control
-         random text time transformers transformers-base unjson vector wai
-         warp
+         http-types invariant kontra-config lifted-base log-base
+         monad-control random text time transformers transformers-base
+         unjson vector wai warp
        ];
        homepage = "https://github.com/scrive/log-utils";
        description = "Utils for working with logs";
@@ -124886,6 +126600,9 @@ self: {
          base containers FontyFruity gasp JuicyPixels lens linear
          lp-diagrams lucid-svg mtl optparse-applicative svg-tree text vector
        ];
+       executableHaskellDepends = [
+         base containers FontyFruity gasp lens lp-diagrams
+       ];
        description = "SVG Backend for lp-diagrams";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -125533,7 +127250,7 @@ self: {
        doHaddock = false;
        description = "liblzma C library and headers for use by LZMA bindings";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       platforms = stdenv.lib.platforms.none;
      }) {};
 
   "lzma-conduit" = callPackage
@@ -127115,10 +128832,10 @@ self: {
      }) {};
 
   "marmalade-upload" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, data-default, directory
-     , exceptions, filepath, http-client, http-client-tls, http-types
-     , keyring, mtl, network, optparse-applicative, tasty, tasty-hunit
-     , text, transformers
+    ({ mkDerivation, aeson, base, bytestring, Cabal, data-default
+     , directory, exceptions, filepath, http-client, http-client-tls
+     , http-types, keyring, mtl, network, optparse-applicative, process
+     , shake, split, tasty, tasty-hunit, text, transformers, zip-archive
      }:
      mkDerivation {
        pname = "marmalade-upload";
@@ -127131,8 +128848,9 @@ self: {
          http-types mtl network text transformers
        ];
        executableHaskellDepends = [
-         aeson base bytestring data-default directory filepath keyring
-         optparse-applicative text transformers
+         aeson base bytestring Cabal data-default directory filepath keyring
+         optparse-applicative process shake split text transformers
+         zip-archive
        ];
        testHaskellDepends = [
          aeson base exceptions tasty tasty-hunit text transformers
@@ -127251,8 +128969,8 @@ self: {
 
   "marxup" = callPackage
     ({ mkDerivation, base, configurator, containers, directory, dlist
-     , filepath, haskell-src-exts, labeled-tree, lens, lp-diagrams, mtl
-     , parsek, pretty, process, text
+     , filepath, graphviz, haskell-src-exts, labeled-tree, lens
+     , lp-diagrams, mtl, parsek, pretty, process, text
      }:
      mkDerivation {
        pname = "marxup";
@@ -127265,7 +128983,7 @@ self: {
          lens lp-diagrams mtl process text
        ];
        executableHaskellDepends = [
-         base configurator dlist parsek pretty
+         base configurator dlist graphviz lens lp-diagrams parsek pretty
        ];
        description = "Markup language preprocessor for Haskell";
        license = stdenv.lib.licenses.gpl2;
@@ -127536,6 +129254,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "matrices_0_4_5" = callPackage
+    ({ mkDerivation, base, criterion, deepseq, primitive, tasty
+     , tasty-hunit, tasty-quickcheck, vector
+     }:
+     mkDerivation {
+       pname = "matrices";
+       version = "0.4.5";
+       sha256 = "15vkkd3jwfdp648lfhskzhnisb1bzqia3asw8fmanpk71l9nyf9d";
+       libraryHaskellDepends = [ base deepseq primitive vector ];
+       testHaskellDepends = [
+         base tasty tasty-hunit tasty-quickcheck vector
+       ];
+       benchmarkHaskellDepends = [ base criterion vector ];
+       description = "native matrix based on vector";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "matrix" = callPackage
     ({ mkDerivation, base, criterion, deepseq, loop, primitive
      , QuickCheck, tasty, tasty-quickcheck, vector
@@ -127667,6 +129403,9 @@ self: {
          memory microlens microlens-th network-uri pretty-show process stm
          template-haskell text time unordered-containers websockets
        ];
+       executableHaskellDepends = [
+         aeson base connection pretty-show process text unordered-containers
+       ];
        testHaskellDepends = [
          aeson base containers HUnit mtl pretty-show stm tasty tasty-hunit
          text unordered-containers
@@ -127857,7 +129596,7 @@ self: {
 
   "mbox-tools" = callPackage
     ({ mkDerivation, base, bytestring, codec-mbox, containers, fclabels
-     , hsemail, mtl, parsec, process, pureMD5
+     , hsemail, mtl, parsec, process, pureMD5, random
      }:
      mkDerivation {
        pname = "mbox-tools";
@@ -127867,7 +129606,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [
          base bytestring codec-mbox containers fclabels hsemail mtl parsec
-         process pureMD5
+         process pureMD5 random
        ];
        homepage = "https://github.com/np/mbox-tools";
        description = "A collection of tools to process mbox files";
@@ -127893,6 +129632,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mbtiles" = callPackage
+    ({ mkDerivation, base, bytestring, directory, HUnit, mtl
+     , sqlite-simple, text, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "mbtiles";
+       version = "0.3.0.0";
+       sha256 = "0v41lzh1pi105nw3kl0kg04q1xlf9mwkhrdyiyc877a2y01xg2np";
+       libraryHaskellDepends = [
+         base bytestring directory mtl sqlite-simple text transformers
+         unordered-containers
+       ];
+       testHaskellDepends = [ base HUnit ];
+       homepage = "https://github.com/caneroj1/mbtiles#readme";
+       description = "Haskell MBTiles client";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "mcl" = callPackage
     ({ mkDerivation, base, binary, bytestring, Cabal, criterion
      , deepseq, ghc-prim, gmpxx, groups, integer-gmp, mcl, openssl
@@ -127999,7 +129756,7 @@ self: {
      }) {};
 
   "mcpi" = callPackage
-    ({ mkDerivation, base, network, split, transformers }:
+    ({ mkDerivation, base, network, pipes, split, transformers }:
      mkDerivation {
        pname = "mcpi";
        version = "0.0.1.2";
@@ -128007,7 +129764,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base network split transformers ];
-       executableHaskellDepends = [ base transformers ];
+       executableHaskellDepends = [ base network pipes transformers ];
        homepage = "https://github.com/DougBurke/hmcpi";
        description = "Connect to MineCraft running on a Raspberry PI";
        license = stdenv.lib.licenses.publicDomain;
@@ -128658,8 +130415,8 @@ self: {
 
   "memcache-conduit" = callPackage
     ({ mkDerivation, attoparsec, attoparsec-binary, base, bytestring
-     , conduit, conduit-extra, memcache-haskell, mtl, network, resourcet
-     , split
+     , conduit, conduit-extra, containers, hashtables, memcache-haskell
+     , monad-control, mtl, network, resourcet, split, stm, transformers
      }:
      mkDerivation {
        pname = "memcache-conduit";
@@ -128671,13 +130428,19 @@ self: {
          attoparsec attoparsec-binary base bytestring conduit conduit-extra
          memcache-haskell mtl network resourcet split
        ];
+       executableHaskellDepends = [
+         base bytestring conduit conduit-extra containers hashtables
+         memcache-haskell monad-control mtl network resourcet stm
+         transformers
+       ];
        description = "Conduit library for memcache procotol";
        license = stdenv.lib.licenses.mit;
      }) {};
 
   "memcache-haskell" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, hashable, HUnit
-     , network, QuickCheck, split, test-framework, test-framework-hunit
+    ({ mkDerivation, attoparsec, base, bytestring, conduit-extra
+     , containers, hashable, hashtables, HUnit, mtl, network, QuickCheck
+     , resourcet, split, stm, test-framework, test-framework-hunit
      , test-framework-quickcheck2, test-framework-th, transformers
      }:
      mkDerivation {
@@ -128689,6 +130452,10 @@ self: {
        libraryHaskellDepends = [
          attoparsec base bytestring hashable network split transformers
        ];
+       executableHaskellDepends = [
+         base bytestring conduit-extra containers hashtables mtl resourcet
+         stm transformers
+       ];
        testHaskellDepends = [
          base bytestring HUnit network QuickCheck split test-framework
          test-framework-hunit test-framework-quickcheck2 test-framework-th
@@ -129500,8 +131267,8 @@ self: {
      }:
      mkDerivation {
        pname = "microstache";
-       version = "1";
-       sha256 = "0r3ia4hamyrij4vdaa6vnfwhgv40xr4g9wcigi6yhm4ymkz5p1z8";
+       version = "1.0.1.1";
+       sha256 = "0851sqr1ppdj6m822635pa3j6qzdf25gyrhkjs25zdry6518bsax";
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq directory filepath parsec
          text transformers unordered-containers vector
@@ -129811,17 +131578,19 @@ self: {
      }) {};
 
   "mikrokosmos" = callPackage
-    ({ mkDerivation, ansi-terminal, base, containers, haskeline, HUnit
-     , mtl, multimap, parsec
+    ({ mkDerivation, ansi-terminal, base, containers, directory
+     , haskeline, HUnit, mtl, multimap, options, parsec, tasty
+     , tasty-hunit
      }:
      mkDerivation {
        pname = "mikrokosmos";
-       version = "0.2.0";
-       sha256 = "1ckmcdc161x7mgr5pjzvaw5p58llq4mnkc4by58gb6927wy4wfw5";
+       version = "0.3.0";
+       sha256 = "1qr0m4iy1xyprw714nrdpkxlr6lmvsb6f9d8m4z13z03njnz4vm6";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         ansi-terminal base containers haskeline HUnit mtl multimap parsec
+         ansi-terminal base containers directory haskeline HUnit mtl
+         multimap options parsec tasty tasty-hunit
        ];
        homepage = "https://github.com/M42/mikrokosmos";
        description = "Lambda calculus interpreter";
@@ -129905,8 +131674,8 @@ self: {
        pname = "mime-mail";
        version = "0.4.13.1";
        sha256 = "05sri6sszmnyxsnrnk5j1wwqf0bawpfb179wjqfsp7bkj886g0cl";
-       revision = "4";
-       editedCabalFile = "129h3siph3pxiddvrr52dsla6jn0yqr55213zv0wamscjmzwwiy1";
+       revision = "6";
+       editedCabalFile = "0v9kc1p8lhg9zfh7c7x6x71rd7k7y6bpw4112ax9995w0aq09dk1";
        libraryHaskellDepends = [
          base base64-bytestring blaze-builder bytestring filepath process
          random text
@@ -130148,6 +131917,41 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "minio-hs_0_3_0" = callPackage
+    ({ mkDerivation, async, base, bytestring, case-insensitive, conduit
+     , conduit-combinators, conduit-extra, containers, cryptonite
+     , cryptonite-conduit, data-default, directory, exceptions, filepath
+     , http-client, http-conduit, http-types, lifted-async, lifted-base
+     , memory, monad-control, protolude, QuickCheck, resourcet, tasty
+     , tasty-hunit, tasty-quickcheck, tasty-smallcheck, temporary, text
+     , text-format, time, transformers, transformers-base, xml-conduit
+     }:
+     mkDerivation {
+       pname = "minio-hs";
+       version = "0.3.0";
+       sha256 = "0bnva7809g7ry31373j7qcmnfiamqfv4r50y6h1k0d7pnsck3bn5";
+       libraryHaskellDepends = [
+         async base bytestring case-insensitive conduit conduit-combinators
+         conduit-extra containers cryptonite cryptonite-conduit data-default
+         exceptions filepath http-client http-conduit http-types
+         lifted-async lifted-base memory monad-control protolude resourcet
+         text text-format time transformers transformers-base xml-conduit
+       ];
+       testHaskellDepends = [
+         async base bytestring case-insensitive conduit conduit-combinators
+         conduit-extra containers cryptonite cryptonite-conduit data-default
+         directory exceptions filepath http-client http-conduit http-types
+         lifted-async lifted-base memory monad-control protolude QuickCheck
+         resourcet tasty tasty-hunit tasty-quickcheck tasty-smallcheck
+         temporary text text-format time transformers transformers-base
+         xml-conduit
+       ];
+       homepage = "https://github.com/minio/minio-hs#readme";
+       description = "A Minio client library, compatible with S3 like services";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "minions" = callPackage
     ({ mkDerivation, ansi-terminal, base, MissingH, process, time }:
      mkDerivation {
@@ -130384,16 +132188,17 @@ self: {
 
   "miso" = callPackage
     ({ mkDerivation, aeson, base, BoundedChan, bytestring, containers
-     , lucid, text, vector
+     , lucid, servant, servant-lucid, text, vector
      }:
      mkDerivation {
        pname = "miso";
-       version = "0.2.1.0";
-       sha256 = "0z7gl1bxh1c6caxwqbf1cqpgrklx7z7f4qp06pipmvwciggcf30v";
+       version = "0.4.0.0";
+       sha256 = "1pfmmc14fsydv6km45sc5w0mgqnsww7l053qh0vrqmzb88zp8h7b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base BoundedChan bytestring containers lucid text vector
+         aeson base BoundedChan bytestring containers lucid servant
+         servant-lucid text vector
        ];
        homepage = "http://github.com/dmjio/miso";
        description = "A tasty Haskell front-end framework";
@@ -131239,6 +133044,7 @@ self: {
        homepage = "https://github.com/ennocramer/monad-dijkstra";
        description = "Monad transformer for weighted graph searches using Dijkstra's or A* algorithm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-exception" = callPackage
@@ -131824,6 +133630,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "monad-skeleton_0_1_4" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "monad-skeleton";
+       version = "0.1.4";
+       sha256 = "1fz8x3lcxp1az4sdbndzkg1w0ik8rddf6p7wd4j4fkbxffvcllri";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/fumieval/monad-skeleton";
+       description = "Monads of program skeleta";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monad-st" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -132304,9 +134123,10 @@ self: {
      }) {};
 
   "monarch" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, doctest
-     , lifted-base, monad-control, mtl, network, pool-conduit, stm
-     , transformers, transformers-base
+    ({ mkDerivation, base, binary, bytestring, containers, criterion
+     , doctest, hspec, lifted-base, monad-control, mtl, network
+     , pool-conduit, stm, tokyotyrant-haskell, transformers
+     , transformers-base
      }:
      mkDerivation {
        pname = "monarch";
@@ -132316,7 +134136,12 @@ self: {
          base binary bytestring containers lifted-base monad-control mtl
          network pool-conduit stm transformers transformers-base
        ];
-       testHaskellDepends = [ base doctest ];
+       testHaskellDepends = [
+         base bytestring doctest hspec transformers
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion tokyotyrant-haskell
+       ];
        homepage = "https://github.com/notogawa/monarch";
        description = "Monadic interface for TokyoTyrant";
        license = stdenv.lib.licenses.bsd3;
@@ -134839,6 +136664,8 @@ self: {
        pname = "mwc-probability";
        version = "1.3.0";
        sha256 = "0vqzzsifar0q33ar1583c0g7250bi8fwpjpiwdq7gsigz8isd6qg";
+       revision = "1";
+       editedCabalFile = "1b1w504ycphpkcq279bjr2m1laxmv7xzhrbqaf6ayym265f75mnb";
        libraryHaskellDepends = [ base mwc-random primitive transformers ];
        homepage = "http://github.com/jtobin/mwc-probability";
        description = "Sampling function-based probability distributions";
@@ -134846,7 +136673,10 @@ self: {
      }) {};
 
   "mwc-random" = callPackage
-    ({ mkDerivation, base, math-functions, primitive, time, vector }:
+    ({ mkDerivation, base, HUnit, math-functions, primitive, QuickCheck
+     , statistics, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, time, vector
+     }:
      mkDerivation {
        pname = "mwc-random";
        version = "0.13.6.0";
@@ -134854,6 +136684,10 @@ self: {
        libraryHaskellDepends = [
          base math-functions primitive time vector
        ];
+       testHaskellDepends = [
+         base HUnit QuickCheck statistics test-framework
+         test-framework-hunit test-framework-quickcheck2 vector
+       ];
        doCheck = false;
        homepage = "https://github.com/bos/mwc-random";
        description = "Fast, high quality pseudo random number generation";
@@ -135660,14 +137494,14 @@ self: {
      }) {};
 
   "naqsha" = callPackage
-    ({ mkDerivation, base, data-default, groups, hspec, HUnit
-     , QuickCheck, vector
+    ({ mkDerivation, base, bytestring, groups, hspec, HUnit, QuickCheck
+     , vector
      }:
      mkDerivation {
        pname = "naqsha";
-       version = "0.1.0.0";
-       sha256 = "11n8vbpngwxj41vbvlp731anc5pzsbjc05czvpprvld8yxdx4vmf";
-       libraryHaskellDepends = [ base data-default groups vector ];
+       version = "0.2.0.1";
+       sha256 = "154wydlz7y6mic4d1670dwn9g1c7z92v6bydll0shn6z05324ha9";
+       libraryHaskellDepends = [ base bytestring groups vector ];
        testHaskellDepends = [ base groups hspec HUnit QuickCheck ];
        homepage = "http://github.com/naqsha/naqsha.git";
        description = "A library for working with geospatial data types";
@@ -136073,6 +137907,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "neko-obfs" = callPackage
+    ({ mkDerivation, async, attoparsec, base, binary, bytestring, lens
+     , network, network-simple, optparse-generic, pipes
+     , pipes-attoparsec, pipes-network, pipes-safe, random, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "neko-obfs";
+       version = "0.1.0.1";
+       sha256 = "1fv15fsdhy3crny3w7k944fsnpjv3vhkdvnj9s1dj64a1pnysi0b";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         async attoparsec base binary bytestring lens network network-simple
+         optparse-generic pipes pipes-attoparsec pipes-network pipes-safe
+         random text transformers
+       ];
+       homepage = "http://github.com/nfjinjing/neko-obfs";
+       description = "a TCP tunnel with packet length obfuscation";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "nemesis" = callPackage
     ({ mkDerivation, base, containers, directory, dlist, Glob, lens
      , mtl, process, time
@@ -136188,7 +138044,7 @@ self: {
      , pred-trie, regex-compat, semigroups, tasty, tasty-hspec, text
      , transformers, tries, unordered-containers
      , wai-middleware-content-type, wai-middleware-verbs
-     , wai-transformers
+     , wai-transformers, warp
      }:
      mkDerivation {
        pname = "nested-routes";
@@ -136202,6 +138058,13 @@ self: {
          semigroups text transformers tries unordered-containers
          wai-middleware-content-type wai-middleware-verbs wai-transformers
        ];
+       executableHaskellDepends = [
+         attoparsec base bytestring composition-extra errors exceptions
+         hashable hashtables HSet http-types mtl poly-arity pred-set
+         pred-trie regex-compat semigroups text transformers tries
+         unordered-containers wai-middleware-content-type
+         wai-middleware-verbs wai-transformers warp
+       ];
        testHaskellDepends = [
          attoparsec base bytestring composition-extra errors exceptions
          hashable hashtables HSet hspec hspec-wai http-types mtl poly-arity
@@ -136686,7 +138549,7 @@ self: {
      }) {};
 
   "network-address" = callPackage
-    ({ mkDerivation, base, Cabal, QuickCheck, test-framework
+    ({ mkDerivation, base, Cabal, criterion, QuickCheck, test-framework
      , test-framework-quickcheck2
      }:
      mkDerivation {
@@ -136696,6 +138559,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base Cabal ];
+       executableHaskellDepends = [ base Cabal criterion ];
        testHaskellDepends = [
          base Cabal QuickCheck test-framework test-framework-quickcheck2
        ];
@@ -136874,6 +138738,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "network-carbon_1_0_10" = callPackage
+    ({ mkDerivation, base, bytestring, network, text, time, vector }:
+     mkDerivation {
+       pname = "network-carbon";
+       version = "1.0.10";
+       sha256 = "0fl6dxsarfrj0da3a1ajzisrnrgcjfwpag1997b0byvvkw47kspc";
+       libraryHaskellDepends = [
+         base bytestring network text time vector
+       ];
+       homepage = "http://github.com/ocharles/network-carbon";
+       description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "network-conduit" = callPackage
     ({ mkDerivation, base, conduit }:
      mkDerivation {
@@ -137235,7 +139114,9 @@ self: {
      }) {};
 
   "network-service" = callPackage
-    ({ mkDerivation, base, base64-bytestring, bytestring, network }:
+    ({ mkDerivation, base, base64-bytestring, bytestring, network
+     , network-simple
+     }:
      mkDerivation {
        pname = "network-service";
        version = "0.1.0.0";
@@ -137245,6 +139126,9 @@ self: {
        libraryHaskellDepends = [
          base base64-bytestring bytestring network
        ];
+       executableHaskellDepends = [
+         base base64-bytestring bytestring network network-simple
+       ];
        homepage = "https://github.com/angerman/network-service";
        description = "Provide a service at the data type level";
        license = stdenv.lib.licenses.mit;
@@ -137372,14 +139256,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "network-transport_0_5_1" = callPackage
+  "network-transport_0_5_2" = callPackage
     ({ mkDerivation, base, binary, bytestring, deepseq, hashable
      , transformers
      }:
      mkDerivation {
        pname = "network-transport";
-       version = "0.5.1";
-       sha256 = "0ilbiksf1g4bg5h9ppd0a5z5a05miv850dyxayk916gjywqfgxi9";
+       version = "0.5.2";
+       sha256 = "0m4hixari440lymj43l9q4485gz6i9a768g7mnzwfynn8cmng5g7";
        libraryHaskellDepends = [
          base binary bytestring deepseq hashable transformers
        ];
@@ -137488,9 +139372,10 @@ self: {
 
   "network-transport-zeromq" = callPackage
     ({ mkDerivation, async, base, binary, bytestring, containers
-     , criterion, data-accessor, distributed-process, exceptions
-     , network-transport, network-transport-tests, random, semigroups
-     , stm, stm-chans, tasty, tasty-hunit, transformers, zeromq4-haskell
+     , criterion, data-accessor, distributed-process
+     , distributed-process-tests, exceptions, network, network-transport
+     , network-transport-tests, random, semigroups, stm, stm-chans
+     , tasty, tasty-hunit, test-framework, transformers, zeromq4-haskell
      }:
      mkDerivation {
        pname = "network-transport-zeromq";
@@ -137503,9 +139388,13 @@ self: {
          network-transport random semigroups stm stm-chans transformers
          zeromq4-haskell
        ];
+       executableHaskellDepends = [
+         base binary bytestring criterion distributed-process
+       ];
        testHaskellDepends = [
-         base network-transport network-transport-tests tasty tasty-hunit
-         zeromq4-haskell
+         base bytestring containers distributed-process-tests network
+         network-transport network-transport-tests stm stm-chans tasty
+         tasty-hunit test-framework zeromq4-haskell
        ];
        benchmarkHaskellDepends = [
          base binary bytestring criterion distributed-process
@@ -137728,8 +139617,9 @@ self: {
 
   "newt" = callPackage
     ({ mkDerivation, array, base, bytestring, cmdargs, containers
-     , directory, filemanip, filepath, mtl, process, safe, text
-     , Unixutils
+     , directory, filemanip, filepath, HUnit, mtl, process, QuickCheck
+     , safe, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, Unixutils, uuid
      }:
      mkDerivation {
        pname = "newt";
@@ -137741,7 +139631,11 @@ self: {
          array base bytestring cmdargs containers directory filemanip
          filepath mtl process safe text Unixutils
        ];
-       executableHaskellDepends = [ base cmdargs containers mtl ];
+       executableHaskellDepends = [
+         base cmdargs containers directory filepath HUnit mtl process
+         QuickCheck safe test-framework test-framework-hunit
+         test-framework-quickcheck2 Unixutils uuid
+       ];
        description = "A trivially simple app to create things from simple templates";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -137855,7 +139749,7 @@ self: {
      }) {};
 
   "nfc" = callPackage
-    ({ mkDerivation, base, bytestring, c2hs, nfc }:
+    ({ mkDerivation, base, base16-bytestring, bytestring, c2hs, nfc }:
      mkDerivation {
        pname = "nfc";
        version = "0.0.1";
@@ -137865,6 +139759,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ nfc ];
        libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [ base base16-bytestring bytestring ];
        homepage = "https://github.com/centromere/nfc#readme";
        description = "libnfc bindings";
        license = stdenv.lib.licenses.publicDomain;
@@ -137872,7 +139767,7 @@ self: {
      }) {nfc = null;};
 
   "nfc_0_1_0" = callPackage
-    ({ mkDerivation, base, bytestring, c2hs, nfc }:
+    ({ mkDerivation, base, base16-bytestring, bytestring, c2hs, nfc }:
      mkDerivation {
        pname = "nfc";
        version = "0.1.0";
@@ -137882,6 +139777,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ nfc ];
        libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [ base base16-bytestring bytestring ];
        homepage = "https://github.com/centromere/nfc#readme";
        description = "libnfc bindings";
        license = stdenv.lib.licenses.publicDomain;
@@ -138342,6 +140238,7 @@ self: {
        homepage = "https://github.com/mrkgnao/noether#readme";
        description = "Math in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nofib-analyse" = callPackage
@@ -138652,7 +140549,7 @@ self: {
      }) {};
 
   "nonlinear-optimization-ad" = callPackage
-    ({ mkDerivation, ad, base, nonlinear-optimization, primitive
+    ({ mkDerivation, ad, base, csv, nonlinear-optimization, primitive
      , reflection, vector
      }:
      mkDerivation {
@@ -138664,6 +140561,7 @@ self: {
        libraryHaskellDepends = [
          ad base nonlinear-optimization primitive reflection vector
        ];
+       executableHaskellDepends = [ base csv ];
        homepage = "https://github.com/msakai/nonlinear-optimization-ad";
        description = "Wrapper of nonlinear-optimization package for using with AD package";
        license = stdenv.lib.licenses.gpl3;
@@ -139215,6 +141113,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "numeric-ode" = callPackage
+    ({ mkDerivation, ad, base, Chart, Chart-cairo, colour
+     , data-accessor, data-default-class, diagrams-cairo, diagrams-lib
+     , diagrams-rasterific, foldl, JuicyPixels, lens, linear, mtl
+     , mwc-probability, mwc-random, numhask, parallel, parsec, plots
+     , primitive, protolude, reflection, tdigest, template-haskell, text
+     , vector, vector-space
+     }:
+     mkDerivation {
+       pname = "numeric-ode";
+       version = "0.0.0.0";
+       sha256 = "04296pcakc7nb2ydc84cq2vy1x7frqfdxc17slda1p325n8b4map";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ad base foldl lens linear mwc-probability mwc-random numhask
+         parallel parsec primitive protolude reflection tdigest
+         template-haskell text vector
+       ];
+       executableHaskellDepends = [
+         base Chart Chart-cairo colour data-accessor data-default-class
+         diagrams-cairo diagrams-lib diagrams-rasterific JuicyPixels linear
+         mtl plots vector vector-space
+       ];
+       homepage = "https://github.com/qnikst/numeric-ode";
+       description = "Ode solvers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "numeric-prelude" = callPackage
     ({ mkDerivation, array, base, containers, deepseq, non-negative
      , parsec, QuickCheck, random, storable-record, utility-ht
@@ -139310,21 +141238,17 @@ self: {
      }) {};
 
   "numhask" = callPackage
-    ({ mkDerivation, adjunctions, base, distributive, doctest, HUnit
-     , protolude, QuickCheck, singletons, tasty, tasty-hunit
-     , tasty-quickcheck, vector
+    ({ mkDerivation, adjunctions, base, distributive, doctest
+     , protolude, QuickCheck, tasty, tasty-quickcheck, vector
      }:
      mkDerivation {
        pname = "numhask";
-       version = "0.0.4";
-       sha256 = "0iyjx8yrbsalycy4qf13jm3q1gn1kpmk0l2r0j38zv2gr199p7df";
+       version = "0.0.8";
+       sha256 = "1mgknk4ilpk216hxclc3zc2gcrk2c9si52r77s6ijhkx398j2v11";
        libraryHaskellDepends = [
-         adjunctions base distributive protolude QuickCheck singletons
-         vector
-       ];
-       testHaskellDepends = [
-         base doctest HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
+         adjunctions base distributive protolude QuickCheck vector
        ];
+       testHaskellDepends = [ base doctest tasty tasty-quickcheck ];
        homepage = "https://github.com/tonyday567/numhask";
        description = "A numeric prelude";
        license = stdenv.lib.licenses.bsd3;
@@ -139332,22 +141256,18 @@ self: {
      }) {};
 
   "numhask-range" = callPackage
-    ({ mkDerivation, base, containers, foldl, formatting, HUnit, lens
-     , linear, numhask, protolude, QuickCheck, smallcheck, tasty
-     , tasty-hspec, tasty-hunit, tasty-quickcheck, tasty-smallcheck
+    ({ mkDerivation, base, containers, foldl, formatting, lens, linear
+     , numhask, protolude, QuickCheck, tasty, tasty-quickcheck
      }:
      mkDerivation {
        pname = "numhask-range";
-       version = "0.0.3";
-       sha256 = "0na22wnyhs30h2h6nfkpgfzxpbcan597l1gg9mayi3g41148cxvj";
+       version = "0.0.4";
+       sha256 = "06crxqgsryw7iixjm0rcsq49xgzirx6qm74iw6bx85a48f1snzqx";
        libraryHaskellDepends = [
          base containers foldl formatting lens linear numhask protolude
          QuickCheck
        ];
-       testHaskellDepends = [
-         base HUnit numhask protolude QuickCheck smallcheck tasty
-         tasty-hspec tasty-hunit tasty-quickcheck tasty-smallcheck
-       ];
+       testHaskellDepends = [ base numhask tasty tasty-quickcheck ];
        homepage = "https://github.com/tonyday567/numhask-range";
        description = "Numbers that are range representations";
        license = stdenv.lib.licenses.bsd3;
@@ -139708,7 +141628,8 @@ self: {
 
   "oberon0" = callPackage
     ({ mkDerivation, array, AspectAG, base, containers, ghc-prim, HList
-     , mtl, murder, template-haskell, transformers, uu-parsinglib, uulib
+     , language-c, mtl, murder, template-haskell, transformers
+     , uu-parsinglib, uulib
      }:
      mkDerivation {
        pname = "oberon0";
@@ -139720,6 +141641,10 @@ self: {
          array AspectAG base containers ghc-prim HList mtl murder
          template-haskell transformers uu-parsinglib uulib
        ];
+       executableHaskellDepends = [
+         AspectAG base containers HList language-c murder uu-parsinglib
+         uulib
+       ];
        doHaddock = false;
        homepage = "http://www.cs.uu.nl/wiki/Center/CoCoCo";
        description = "Oberon0 Compiler";
@@ -140362,6 +142287,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "online" = callPackage
+    ({ mkDerivation, base, foldl, numhask, protolude, tdigest, vector
+     , vector-algorithms
+     }:
+     mkDerivation {
+       pname = "online";
+       version = "0.2.0";
+       sha256 = "13vg34h09ds49r5j6dg8kqh90iqhbadr6jv57y0766h1pmr5i8kh";
+       libraryHaskellDepends = [
+         base foldl numhask protolude tdigest vector vector-algorithms
+       ];
+       homepage = "https://github.com/tonyday567/online";
+       description = "online statistics";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "only" = callPackage
     ({ mkDerivation, base, parsec, regex-compat }:
      mkDerivation {
@@ -141752,6 +143694,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "optparse-version" = callPackage
+    ({ mkDerivation, base, optparse-applicative }:
+     mkDerivation {
+       pname = "optparse-version";
+       version = "0.3.0.0";
+       sha256 = "08mv8ah4g5xs91245gpgh6r0mgdz6rk7ykk1ywr8gfwn3dx1zm7x";
+       libraryHaskellDepends = [ base optparse-applicative ];
+       homepage = "https://github.com/shmish111/optparse-version";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "orc" = callPackage
     ({ mkDerivation, base, deepseq, monadIO, mtl, process, random, stm
      }:
@@ -142070,6 +144023,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "orizentic" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, hspec, jwt
+     , mtl, optparse-applicative, random, text, time, uuid
+     }:
+     mkDerivation {
+       pname = "orizentic";
+       version = "0.1.0.0";
+       sha256 = "0dyq7n1zxhz23l3jxbryrsvpqrb6yjnc30zph6ik1r0k6nfm2931";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers jwt mtl random text time uuid
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring jwt mtl optparse-applicative text time
+       ];
+       testHaskellDepends = [ base hspec jwt mtl time ];
+       homepage = "https://github.com/luminescent-dreams/orizentic#readme";
+       description = "Token-based authentication and authorization";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "os-release" = callPackage
     ({ mkDerivation, base, containers, hlint, hspec, parsec, process
      , regex-compat, temporary, transformers
@@ -142384,6 +144359,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "packdeps_0_4_4" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, directory
+     , filepath, optparse-applicative, process, semigroups, split, tar
+     , text, time
+     }:
+     mkDerivation {
+       pname = "packdeps";
+       version = "0.4.4";
+       sha256 = "0zlbcbid9q1fyl9gqr2h3z1bmdip1xzxr14q6kgwgdjw785x9a2l";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring Cabal containers directory filepath split tar text
+         time
+       ];
+       executableHaskellDepends = [
+         base Cabal containers optparse-applicative process semigroups
+       ];
+       homepage = "http://packdeps.haskellers.com/";
+       description = "Check your cabal packages for lagging dependencies";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "packed-dawg" = callPackage
     ({ mkDerivation, base, binary, criterion, deepseq, HUnit, mtl
      , QuickCheck, tasty, tasty-hunit, tasty-quickcheck
@@ -142770,8 +144769,9 @@ self: {
          xml-conduit yaml
        ];
        executableHaskellDepends = [
-         aeson aeson-pretty attoparsec base bytestring filepath pandoc
-         pandoc-types syb text yaml
+         aeson aeson-pretty attoparsec base bytestring containers directory
+         filepath mtl pandoc pandoc-types process syb temporary text vector
+         yaml
        ];
        testHaskellDepends = [
          aeson base bytestring directory filepath mtl pandoc pandoc-types
@@ -142803,8 +144803,9 @@ self: {
          xml-conduit yaml
        ];
        executableHaskellDepends = [
-         aeson aeson-pretty attoparsec base bytestring filepath pandoc
-         pandoc-types syb text yaml
+         aeson aeson-pretty attoparsec base bytestring containers directory
+         filepath mtl pandoc pandoc-types process syb temporary text vector
+         yaml
        ];
        testHaskellDepends = [
          aeson base bytestring directory filepath mtl pandoc pandoc-types
@@ -143616,8 +145617,8 @@ self: {
      }:
      mkDerivation {
        pname = "papillon";
-       version = "0.1.0.3";
-       sha256 = "1y9xcy5fz28c08kv6y8qc52bzlpzyipf6dy2ij81xjsl22s7fwc2";
+       version = "0.1.0.4";
+       sha256 = "0g2kanpy8jqi6kmhwk0xy5bjpafnc21cgzp49xxw5zgmpn14amis";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -143870,12 +145871,13 @@ self: {
      }) {};
 
   "parconc-examples" = callPackage
-    ({ mkDerivation, abstract-par, accelerate, array, async, base
-     , binary, bytestring, containers, deepseq, directory
+    ({ mkDerivation, abstract-par, accelerate, accelerate-io, array
+     , async, base, binary, bytestring, containers, deepseq, directory
      , distributed-process, distributed-process-simplelocalnet
-     , distributed-static, filepath, http-conduit, monad-par, network
-     , network-uri, normaldistribution, parallel, random, repa, stm
-     , template-haskell, time, transformers, utf8-string, vector, xml
+     , distributed-static, fclabels, filepath, http-conduit, monad-par
+     , network, network-uri, normaldistribution, parallel, random, repa
+     , stm, template-haskell, time, transformers, utf8-string, vector
+     , xml
      }:
      mkDerivation {
        pname = "parconc-examples";
@@ -143884,12 +145886,12 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         abstract-par accelerate array async base binary bytestring
-         containers deepseq directory distributed-process
-         distributed-process-simplelocalnet distributed-static filepath
-         http-conduit monad-par network network-uri normaldistribution
-         parallel random repa stm template-haskell time transformers
-         utf8-string vector xml
+         abstract-par accelerate accelerate-io array async base binary
+         bytestring containers deepseq directory distributed-process
+         distributed-process-simplelocalnet distributed-static fclabels
+         filepath http-conduit monad-par network network-uri
+         normaldistribution parallel random repa stm template-haskell time
+         transformers utf8-string vector xml
        ];
        homepage = "http://github.com/simonmar/parconc-examples";
        description = "Examples to accompany the book \"Parallel and Concurrent Programming in Haskell\"";
@@ -145381,8 +147383,8 @@ self: {
      }:
      mkDerivation {
        pname = "pdfname";
-       version = "0.1.3";
-       sha256 = "0zrjz46fkrad76bwvylwv2ai9ygvrvh0mcdla26ax31w80wx5hk8";
+       version = "0.2";
+       sha256 = "18ihz3vir5py6fbkqdnh8yjvsgjwavb7g601abdihrrp2p255lpn";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -145391,6 +147393,7 @@ self: {
        homepage = "https://github.com/asr/pdfname#readme";
        description = "Name a PDF file using information from the pdfinfo command";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pdfsplit" = callPackage
@@ -145535,6 +147538,7 @@ self: {
          base hashtables haskell-src-meta ListLike monad-control mtl
          template-haskell
        ];
+       executableHaskellDepends = [ base ];
        homepage = "http://tanakh.github.com/Peggy";
        description = "The Parser Generator for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -145680,6 +147684,7 @@ self: {
        homepage = "http://penrose.ink";
        description = "A system that automatically visualize mathematics";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "peparser" = callPackage
@@ -145755,6 +147760,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "perf" = callPackage
+    ({ mkDerivation, base, chart-unit, containers, foldl, formatting
+     , mwc-probability, optparse-generic, protolude, rdtsc, tdigest
+     , text, time, vector
+     }:
+     mkDerivation {
+       pname = "perf";
+       version = "0.1.2";
+       sha256 = "0ym5dy1zxbiaxf0jpwsf9ivf90lf5zhxznwvf4xynqvqkw602cmz";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers foldl protolude rdtsc tdigest time
+       ];
+       executableHaskellDepends = [
+         base chart-unit foldl formatting mwc-probability optparse-generic
+         protolude tdigest text vector
+       ];
+       homepage = "https://github.com/tonyday567/perf";
+       description = "low-level performance statistics";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "perfecthash" = callPackage
     ({ mkDerivation, array, base, bytestring, cmph, containers
      , criterion, deepseq, hspec, QuickCheck, random, time
@@ -145893,14 +147922,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "persistable-record_0_5_0_2" = callPackage
+  "persistable-record_0_5_1_1" = callPackage
     ({ mkDerivation, array, base, containers, dlist, names-th
      , quickcheck-simple, template-haskell, th-data-compat, transformers
      }:
      mkDerivation {
        pname = "persistable-record";
-       version = "0.5.0.2";
-       sha256 = "125zx0c1jccbb62azx5z36gr27fa8rxr5ydnq5w1wyqi0w4kxg02";
+       version = "0.5.1.1";
+       sha256 = "0n0ycgssq9aslbb024a59c3hgxbgwmd7cz8hz03ac07xdl7z9sc0";
        libraryHaskellDepends = [
          array base containers dlist names-th template-haskell
          th-data-compat transformers
@@ -146386,6 +148415,7 @@ self: {
          monad-logger old-locale persistent resource-pool resourcet text
          time transformers unordered-containers
        ];
+       executableHaskellDepends = [ base monad-logger ];
        testHaskellDepends = [
          base hspec persistent persistent-template temporary text time
          transformers
@@ -146641,6 +148671,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pg-recorder" = callPackage
+    ({ mkDerivation, base, bytestring, contravariant, either, hasql
+     , hasql-pool, hspec, optparse-applicative, optparse-text
+     , postgresql-libpq, protolude, resource-pool, stringsearch, text
+     }:
+     mkDerivation {
+       pname = "pg-recorder";
+       version = "0.2.0.0";
+       sha256 = "1584c355alhwar346ag7pd5q0vrpl40fiqj66fbildamiqchjmvd";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring contravariant either hasql hasql-pool
+         optparse-applicative optparse-text postgresql-libpq protolude
+         resource-pool stringsearch text
+       ];
+       executableHaskellDepends = [ base protolude ];
+       testHaskellDepends = [
+         base hasql hasql-pool hspec postgresql-libpq protolude
+         resource-pool
+       ];
+       homepage = "https://github.com/githubuser/pg-recorder#readme";
+       description = "Initial project template from stack";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pg-store" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
      , hashable, haskell-src-meta, mtl, postgresql-libpq, QuickCheck
@@ -148474,6 +150531,9 @@ self: {
        libraryHaskellDepends = [
          base bytestring pipes pipes-safe semigroups zeromq4-haskell
        ];
+       executableHaskellDepends = [
+         base bytestring pipes pipes-safe semigroups zeromq4-haskell
+       ];
        homepage = "https://github.com/peddie/pipes-zeromq4";
        description = "Pipes integration for ZeroMQ messaging";
        license = stdenv.lib.licenses.bsd3;
@@ -148779,6 +150839,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "platinum-parsing" = callPackage
+    ({ mkDerivation, base, binary, clock, containers, data-hash
+     , directory, fgl, hspec, HStringTemplate, mtl, optparse-applicative
+     , parsec, text, vector, yaml
+     }:
+     mkDerivation {
+       pname = "platinum-parsing";
+       version = "0.1.0.0";
+       sha256 = "1xngg7w238ngfwj2sz8rgkjnbhlqiz3lqnl6k3akfn9s6cdgk82y";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary containers fgl HStringTemplate mtl parsec text vector
+       ];
+       executableHaskellDepends = [
+         base binary clock containers data-hash directory fgl mtl
+         optparse-applicative text vector yaml
+       ];
+       testHaskellDepends = [ base containers fgl hspec vector ];
+       homepage = "https://github.com/chlablak/platinum-parsing";
+       description = "General Framework for compiler development";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "playlists" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, doctest, filepath
      , hspec, optparse-applicative, text, word8
@@ -148975,16 +151060,16 @@ self: {
      }:
      mkDerivation {
        pname = "plot-light";
-       version = "0.2.1";
-       sha256 = "1zpmmwqvpf6xba6pc7b884glwg3f23hc64srjshmaaa4dv3fjf21";
+       version = "0.2.4";
+       sha256 = "0zwp8n9xx1ljh65as4s6lqj4a3nrz3hfg53x8zcba96ic9jkadn0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base blaze-svg colour palette scientific text time
+         attoparsec base blaze-svg colour palette scientific text time
        ];
        executableHaskellDepends = [
-         attoparsec attoparsec-time base blaze-svg colour scientific text
-         time
+         attoparsec attoparsec-time base blaze-svg colour palette scientific
+         text time
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "https://github.com/ocramz/plot-light";
@@ -149464,6 +151549,7 @@ self: {
        librarySystemDepends = [ poker-eval ];
        description = "Binding to libpoker-eval";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) poker-eval;};
 
   "pokitdok" = callPackage
@@ -150681,27 +152767,18 @@ self: {
      }) {};
 
   "postgresql-simple-queue" = callPackage
-    ({ mkDerivation, aeson, amazonka, amazonka-ses, async, base
-     , bytestring, data-default, exceptions, hspec, hspec-discover
-     , hspec-expectations-lifted, hspec-pg-transact, lens, lifted-async
-     , lifted-base, monad-control, optparse-generic, pg-transact
-     , postgresql-simple, postgresql-simple-opts, random, resource-pool
-     , text, time, transformers, uuid
+    ({ mkDerivation, aeson, async, base, bytestring, exceptions, hspec
+     , hspec-discover, hspec-expectations-lifted, hspec-pg-transact
+     , monad-control, pg-transact, postgresql-simple, random, text, time
+     , transformers
      }:
      mkDerivation {
        pname = "postgresql-simple-queue";
-       version = "0.1.0.1";
-       sha256 = "1rwfv4ii4bdxq4ikvjrjrwbn9csr5q4qmmi7d5r0656a4qi9syh9";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.5.0.1";
+       sha256 = "0nzl7yknva09gwrmnvk4swlkgdksbcxw83bk4cacnmm2n42y3h8a";
        libraryHaskellDepends = [
-         aeson base bytestring data-default exceptions lifted-async
-         lifted-base monad-control optparse-generic pg-transact
-         postgresql-simple postgresql-simple-opts random resource-pool text
-         time transformers uuid
-       ];
-       executableHaskellDepends = [
-         aeson amazonka amazonka-ses base lens lifted-base text
+         aeson base bytestring exceptions monad-control pg-transact
+         postgresql-simple random text time transformers
        ];
        testHaskellDepends = [
          aeson async base bytestring hspec hspec-discover
@@ -150889,20 +152966,22 @@ self: {
      , base64-bytestring, bytestring, configurator, containers, either
      , hasql, hasql-pool, heredoc, hspec, hspec-wai, hspec-wai-json
      , http-types, jwt, lens, lens-aeson, optparse-applicative
-     , postgresql-libpq, protolude, retry, stm, stm-containers, text
-     , time, transformers, unix, unordered-containers, wai
-     , wai-app-static, wai-extra, wai-websockets, warp, websockets
+     , postgresql-libpq, protolude, retry, stm, stm-containers
+     , stringsearch, text, time, transformers, unix
+     , unordered-containers, wai, wai-app-static, wai-extra
+     , wai-websockets, warp, websockets
      }:
      mkDerivation {
        pname = "postgrest-ws";
-       version = "0.3.2.0";
-       sha256 = "04jj51fhssw4fa050qa8pk559m38kc8mharswidxph52vi6jv051";
+       version = "0.3.3.0";
+       sha256 = "0w1hgn0lg6p3zc5n43d2wqr18kwvbvvhp8al3ggf3jjx04sn3sih";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring either hasql hasql-pool http-types jwt lens
-         lens-aeson postgresql-libpq protolude retry stm stm-containers text
-         time unordered-containers wai wai-websockets websockets
+         lens-aeson postgresql-libpq protolude retry stm stm-containers
+         stringsearch text time unordered-containers wai wai-websockets
+         websockets
        ];
        executableHaskellDepends = [
          ansi-wl-pprint auto-update base base64-bytestring bytestring
@@ -150921,8 +153000,8 @@ self: {
 
   "postie" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, cprng-aes
-     , data-default-class, mtl, network, pipes, pipes-parse
-     , stringsearch, tls, transformers, uuid
+     , data-default-class, mtl, network, pipes, pipes-bytestring
+     , pipes-parse, stringsearch, tls, transformers, uuid
      }:
      mkDerivation {
        pname = "postie";
@@ -150934,6 +153013,9 @@ self: {
          attoparsec base bytestring cprng-aes data-default-class mtl network
          pipes pipes-parse stringsearch tls transformers uuid
        ];
+       executableHaskellDepends = [
+         base bytestring data-default-class pipes pipes-bytestring tls
+       ];
        description = "SMTP server library to receive emails from within Haskell programs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -150953,6 +153035,7 @@ self: {
          aeson attoparsec base bytestring containers http-client-tls
          http-types network-api-support text
        ];
+       executableHaskellDepends = [ base text ];
        homepage = "https://github.com/apiengine/postmark";
        description = "Library for postmarkapp.com HTTP Api";
        license = stdenv.lib.licenses.bsd3;
@@ -151180,12 +153263,13 @@ self: {
      }) {};
 
   "pqc" = callPackage
-    ({ mkDerivation, base, QuickCheck, random, stm }:
+    ({ mkDerivation, base, ChasingBottoms, QuickCheck, random, stm }:
      mkDerivation {
        pname = "pqc";
        version = "0.8";
        sha256 = "1n71qhlxn9js5cizyqdq9f7m08m5j0354871r8b47bnzdi2kqkc4";
        libraryHaskellDepends = [ base QuickCheck random stm ];
+       testHaskellDepends = [ base ChasingBottoms ];
        homepage = "http://hub.darcs.net/shelarcy/pqc";
        description = "Parallel batch driver for QuickCheck";
        license = stdenv.lib.licenses.bsd3;
@@ -151454,9 +153538,10 @@ self: {
      }) {};
 
   "prefork" = callPackage
-    ({ mkDerivation, base, cab, containers, data-default, directory
-     , filepath, hspec, process, stm, system-argv0, system-filepath
-     , unix
+    ({ mkDerivation, async, base, blaze-builder, bytestring, cab
+     , cmdargs, containers, data-default, directory, filepath, hspec
+     , http-types, network, process, stm, system-argv0, system-filepath
+     , unix, wai, warp
      }:
      mkDerivation {
        pname = "prefork";
@@ -151468,6 +153553,10 @@ self: {
          base containers data-default process stm system-argv0
          system-filepath unix
        ];
+       executableHaskellDepends = [
+         async base blaze-builder bytestring cmdargs containers http-types
+         network stm unix wai warp
+       ];
        testHaskellDepends = [
          base cab containers directory filepath hspec process stm unix
        ];
@@ -151852,8 +153941,8 @@ self: {
      }) {};
 
   "pretty-simple" = callPackage
-    ({ mkDerivation, ansi-terminal, base, containers, criterion
-     , doctest, Glob, mtl, parsec, text, transformers
+    ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers
+     , criterion, doctest, Glob, mtl, parsec, text, transformers
      }:
      mkDerivation {
        pname = "pretty-simple";
@@ -151864,6 +153953,7 @@ self: {
        libraryHaskellDepends = [
          ansi-terminal base containers mtl parsec text transformers
        ];
+       executableHaskellDepends = [ aeson base bytestring text ];
        testHaskellDepends = [ base doctest Glob ];
        benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com/cdepillabout/pretty-simple";
@@ -151932,7 +154022,8 @@ self: {
   "prettyprinter" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, criterion
      , doctest, mtl, pgp-wordlist, QuickCheck, random, tasty
-     , tasty-hunit, tasty-quickcheck, text, transformers
+     , tasty-hunit, tasty-quickcheck, template-haskell, text
+     , transformers
      }:
      mkDerivation {
        pname = "prettyprinter";
@@ -151943,6 +154034,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base text ];
+       executableHaskellDepends = [ base template-haskell text ];
        testHaskellDepends = [
          base bytestring doctest pgp-wordlist QuickCheck tasty tasty-hunit
          tasty-quickcheck text
@@ -152398,14 +154490,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "process_1_6_0_0" = callPackage
+  "process_1_6_1_0" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, directory, filepath
      , unix
      }:
      mkDerivation {
        pname = "process";
-       version = "1.6.0.0";
-       sha256 = "02ysv3ygfa97w9yqr9m5ks8yg49rpjmwdx1hq8bl83cawjkwjd1m";
+       version = "1.6.1.0";
+       sha256 = "0lwaa9qfh1x8zgmq7panhsvrs1nwcc1fficcg391dxp995ga4pr4";
        libraryHaskellDepends = [ base deepseq directory filepath unix ];
        testHaskellDepends = [ base bytestring directory ];
        description = "Process libraries";
@@ -152866,6 +154958,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base io-reactive ];
+       executableHaskellDepends = [ base ];
        description = "Progressbar API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -152988,6 +155081,7 @@ self: {
        homepage = "https://github.com/agentm/project-m36";
        description = "Relational Algebra Engine";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "project-template" = callPackage
@@ -153270,8 +155364,8 @@ self: {
      }:
      mkDerivation {
        pname = "propellor";
-       version = "4.4.0";
-       sha256 = "1rh8k1g8wpp898qh3g2k19v7qd95lv7l8vnb52dns350pgyswssx";
+       version = "4.5.2";
+       sha256 = "15bs8l7i7m4s0h3mb3cc1frq60s96qnfmmvb0blyvjk6ydsi5qrx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -153368,7 +155462,7 @@ self: {
      }) {};
 
   "proteaaudio" = callPackage
-    ({ mkDerivation, base, bytestring, c2hs, libpulseaudio }:
+    ({ mkDerivation, base, bytestring, c2hs, filepath, libpulseaudio }:
      mkDerivation {
        pname = "proteaaudio";
        version = "0.7.0.1";
@@ -153378,6 +155472,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ libpulseaudio ];
        libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [ base bytestring filepath ];
        description = "Simple audio library for Windows, Linux, OSX";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -153419,6 +155514,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "proto-lens-arbitrary_0_1_1_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, lens-family
+     , proto-lens, QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "proto-lens-arbitrary";
+       version = "0.1.1.0";
+       sha256 = "0bqd6xfak7x5pvaa0znq57yr6a6iw2p97ssb87pcsmv34cfw0l16";
+       libraryHaskellDepends = [
+         base bytestring containers lens-family proto-lens QuickCheck text
+       ];
+       homepage = "https://github.com/google/proto-lens";
+       description = "Arbitrary instances for proto-lens";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "proto-lens-combinators" = callPackage
     ({ mkDerivation, base, Cabal, data-default-class, HUnit
      , lens-family, lens-family-core, proto-lens, proto-lens-protoc
@@ -154212,6 +156324,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base containers stm unix ];
        librarySystemDepends = [ libpulseaudio ];
+       executableHaskellDepends = [ base ];
        description = "A low-level (incomplete) wrapper around the pulseaudio client asynchronous api";
        license = stdenv.lib.licenses.lgpl3;
      }) {inherit (pkgs) libpulseaudio;};
@@ -155480,6 +157593,7 @@ self: {
        libraryHaskellDepends = [
          ansi-terminal base readline terminal-size
        ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/yamadapc/haskell-questioner.git";
        description = "A package for prompting values from the command-line";
        license = stdenv.lib.licenses.mit;
@@ -155564,8 +157678,9 @@ self: {
 
   "quickbooks" = callPackage
     ({ mkDerivation, aeson, authenticate-oauth, base, bytestring
-     , email-validate, fast-logger, http-client, http-client-tls
-     , http-types, interpolate, old-locale, text, thyme, yaml
+     , doctest, email-validate, fast-logger, http-client
+     , http-client-tls, http-types, interpolate, old-locale, text, thyme
+     , yaml
      }:
      mkDerivation {
        pname = "quickbooks";
@@ -155576,6 +157691,7 @@ self: {
          http-client http-client-tls http-types interpolate old-locale text
          thyme yaml
        ];
+       testHaskellDepends = [ base doctest ];
        description = "QuickBooks API binding";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -155735,12 +157851,17 @@ self: {
      }) {};
 
   "quickcheck-property-monad" = callPackage
-    ({ mkDerivation, base, either, QuickCheck, transformers }:
+    ({ mkDerivation, base, directory, doctest, either, filepath
+     , QuickCheck, transformers
+     }:
      mkDerivation {
        pname = "quickcheck-property-monad";
        version = "0.2.4";
        sha256 = "0sp7592jfh6i8xsykl2lv8bspnp755fnpqvqa09dhwq6hm0r1r9c";
        libraryHaskellDepends = [ base either QuickCheck transformers ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck
+       ];
        homepage = "http://github.com/bennofs/quickcheck-property-monad/";
        description = "A monad for generating QuickCheck properties without Arbitrary instances";
        license = stdenv.lib.licenses.bsd3;
@@ -155960,7 +158081,8 @@ self: {
      }) {};
 
   "quickpull" = callPackage
-    ({ mkDerivation, base, directory, filepath, QuickCheck }:
+    ({ mkDerivation, barecheck, base, directory, filepath, QuickCheck
+     }:
      mkDerivation {
        pname = "quickpull";
        version = "0.4.2.2";
@@ -155968,7 +158090,9 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory filepath QuickCheck ];
-       executableHaskellDepends = [ base directory filepath QuickCheck ];
+       executableHaskellDepends = [
+         barecheck base directory filepath QuickCheck
+       ];
        testHaskellDepends = [ base directory filepath QuickCheck ];
        homepage = "http://www.github.com/massysett/quickpull";
        description = "Generate Main module with QuickCheck tests";
@@ -157498,6 +159622,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ratel_0_3_4" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, case-insensitive
+     , containers, http-client, http-client-tls, http-types, tasty
+     , tasty-hspec, text, uuid
+     }:
+     mkDerivation {
+       pname = "ratel";
+       version = "0.3.4";
+       sha256 = "1j589qm8711h2ycy19s7i25sx217v5y5c1h4ks6x4dkpzk33c1hm";
+       libraryHaskellDepends = [
+         aeson base bytestring case-insensitive containers http-client
+         http-client-tls http-types text uuid
+       ];
+       testHaskellDepends = [ base tasty tasty-hspec ];
+       homepage = "https://github.com/tfausak/ratel#readme";
+       description = "Notify Honeybadger about exceptions";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ratel-wai" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , http-client, ratel, wai
@@ -157564,23 +159708,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "rattletrap_2_5_0" = callPackage
-    ({ mkDerivation, aeson, aeson-casing, base, bimap, binary
-     , binary-bits, bytestring, containers, data-binary-ieee754
-     , filepath, hspec, template-haskell, temporary, text, vector
+  "rattletrap_2_5_2" = callPackage
+    ({ mkDerivation, aeson, base, bimap, binary, binary-bits
+     , bytestring, containers, data-binary-ieee754, filepath, hspec
+     , template-haskell, temporary, text, vector
      }:
      mkDerivation {
        pname = "rattletrap";
-       version = "2.5.0";
-       sha256 = "14ksxmwy53xpa9k5swz8254x3kgswkb91r7fnkx85pph5x09qwxd";
+       version = "2.5.2";
+       sha256 = "13l4gx7l0qniyny5llniwmymk8kbi7lak1gq68hyx9wnmjhbw585";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson aeson-casing base bimap binary binary-bits bytestring
-         containers data-binary-ieee754 template-haskell text vector
+         aeson base bimap binary binary-bits bytestring containers
+         data-binary-ieee754 template-haskell text vector
+       ];
+       executableHaskellDepends = [
+         aeson base bimap binary binary-bits bytestring containers
+         data-binary-ieee754 template-haskell text vector
+       ];
+       testHaskellDepends = [
+         aeson base bimap binary binary-bits bytestring containers
+         data-binary-ieee754 filepath hspec template-haskell temporary text
+         vector
        ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [ base bytestring filepath hspec temporary ];
        homepage = "https://github.com/tfausak/rattletrap#readme";
        description = "Parse and generate Rocket League replays";
        license = stdenv.lib.licenses.mit;
@@ -157968,6 +160119,7 @@ self: {
          aeson base bytestring deepseq mtl template-haskell text time
          unordered-containers
        ];
+       executableHaskellDepends = [ aeson base deepseq text time ];
        homepage = "https://bitbucket.org/wuzzeb/react-flux";
        description = "A binding to React based on the Flux application architecture for GHCJS";
        license = stdenv.lib.licenses.bsd3;
@@ -159544,6 +161696,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "reform-happstack_0_2_5_2" = callPackage
+    ({ mkDerivation, base, bytestring, happstack-server, mtl, random
+     , reform, text, utf8-string
+     }:
+     mkDerivation {
+       pname = "reform-happstack";
+       version = "0.2.5.2";
+       sha256 = "0d6w500y47ghmiawlv116hqrknr1sx4k525c7arq340slzch03r6";
+       libraryHaskellDepends = [
+         base bytestring happstack-server mtl random reform text utf8-string
+       ];
+       homepage = "http://www.happstack.com/";
+       description = "Happstack support for reform";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "reform-hsp" = callPackage
     ({ mkDerivation, base, hsp, hsx2hs, reform, text }:
      mkDerivation {
@@ -159565,6 +161734,9 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base data-default exceptions lens mtl ];
+       executableHaskellDepends = [
+         base data-default exceptions lens mtl
+       ];
        homepage = "https://github.com/konn/refresht#readme";
        description = "Environment Monad with automatic resource refreshment";
        license = stdenv.lib.licenses.bsd3;
@@ -160554,7 +162726,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "relational-query_0_9_2_1" = callPackage
+  "relational-query_0_9_4_1" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, dlist
      , names-th, persistable-record, quickcheck-simple, sql-words
      , template-haskell, text, th-reify-compat, time, time-locale-compat
@@ -160562,8 +162734,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query";
-       version = "0.9.2.1";
-       sha256 = "0sdmvbzfxbs7hk71zdn8bhbzdcw10h9apm5gn47cmiqkyiv5si5k";
+       version = "0.9.4.1";
+       sha256 = "05x6v4587qhv6a82r9kdgsg0bcpgvjfihv17iv2hn98cl2f0m2cc";
        libraryHaskellDepends = [
          array base bytestring containers dlist names-th persistable-record
          sql-words template-haskell text th-reify-compat time
@@ -160598,7 +162770,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "relational-query-HDBC_0_6_2_1" = callPackage
+  "relational-query-HDBC_0_6_4_0" = callPackage
     ({ mkDerivation, base, containers, convertible, dlist, HDBC
      , HDBC-session, names-th, persistable-record, relational-query
      , relational-schemas, template-haskell, th-data-compat
@@ -160606,8 +162778,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query-HDBC";
-       version = "0.6.2.1";
-       sha256 = "1slx0zh9487q77spajwibnxpc5xwcdqg6i98gzxfd1k3jfh2ylw2";
+       version = "0.6.4.0";
+       sha256 = "1mybp5nq0l4c9b4as16878c02z282ml3gxisnkrwb80y1xrgdfd2";
        libraryHaskellDepends = [
          base containers convertible dlist HDBC HDBC-session names-th
          persistable-record relational-query relational-schemas
@@ -160658,7 +162830,7 @@ self: {
   "relational-record-examples" = callPackage
     ({ mkDerivation, base, HDBC, HDBC-session, HDBC-sqlite3
      , persistable-record, relational-query, relational-query-HDBC
-     , relational-schemas, template-haskell
+     , relational-schemas, template-haskell, time
      }:
      mkDerivation {
        pname = "relational-record-examples";
@@ -160671,6 +162843,9 @@ self: {
          relational-query relational-query-HDBC relational-schemas
          template-haskell
        ];
+       executableHaskellDepends = [
+         base relational-query template-haskell time
+       ];
        description = "Examples of Haskell Relationa Record";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -161287,6 +163462,9 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base hsndfile repa ];
+       executableHaskellDepends = [
+         base hsndfile hsndfile-vector repa vector
+       ];
        testHaskellDepends = [
          base directory filepath hsndfile hsndfile-vector repa vector
        ];
@@ -161559,7 +163737,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "req_0_3_0" = callPackage
+  "req_0_3_1" = callPackage
     ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder
      , bytestring, case-insensitive, connection, data-default-class
      , hspec, hspec-core, http-api-data, http-client, http-client-tls
@@ -161568,8 +163746,8 @@ self: {
      }:
      mkDerivation {
        pname = "req";
-       version = "0.3.0";
-       sha256 = "1wmj2grzkdwhi2cksp4xzxlrb99y9wysjxzvbbfy75dz2pkkwz3m";
+       version = "0.3.1";
+       sha256 = "0qg2773h247ahicz1051zrpc6aqf6zdqyrlp8q274l3qg5q1l03a";
        libraryHaskellDepends = [
          aeson authenticate-oauth base blaze-builder bytestring
          case-insensitive connection data-default-class http-api-data
@@ -161730,15 +163908,16 @@ self: {
      }) {};
 
   "resin" = callPackage
-    ({ mkDerivation, base, ghc-prim, semigroupoids }:
+    ({ mkDerivation, base, ghc-prim, ralist, semigroupoids }:
      mkDerivation {
        pname = "resin";
-       version = "0.1.0.2";
-       sha256 = "1vhki81r2a4pbpl94zx45wr7hw950ibs6asim27pzh1nyakw9pbg";
-       libraryHaskellDepends = [ base ghc-prim semigroupoids ];
+       version = "0.2.0.2";
+       sha256 = "01cllvyxiyqd0a8kg2whwrgmhgfb4akxmb2nx88l2z8lxa5nfz2j";
+       libraryHaskellDepends = [ base ghc-prim ralist semigroupoids ];
        homepage = "http://github.com/cartazio/resin";
        description = "High performance variable binders";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "resistor-cube" = callPackage
@@ -162220,9 +164399,9 @@ self: {
      }) {};
 
   "rethinkdb" = callPackage
-    ({ mkDerivation, aeson, async, base, base64-bytestring, binary
-     , bytestring, containers, criterion, data-default, doctest, mtl
-     , network, scientific, text, time, unordered-containers
+    ({ mkDerivation, aeson, async, attoparsec, base, base64-bytestring
+     , binary, bytestring, containers, criterion, data-default, doctest
+     , mtl, network, scientific, text, time, unordered-containers
      , utf8-string, vector
      }:
      mkDerivation {
@@ -162236,6 +164415,7 @@ self: {
          data-default mtl network scientific text time unordered-containers
          utf8-string vector
        ];
+       executableHaskellDepends = [ attoparsec base text ];
        testHaskellDepends = [ base doctest ];
        benchmarkHaskellDepends = [ aeson async base criterion text ];
        homepage = "http://github.com/atnnn/haskell-rethinkdb";
@@ -162536,6 +164716,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring containers ];
+       executableHaskellDepends = [ base bytestring containers ];
        description = "Simple unicode collation as per RFC5051";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -164398,6 +166579,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers parsec text ];
+       executableHaskellDepends = [ base containers parsec text ];
        testHaskellDepends = [ base parsec QuickCheck text ];
        homepage = "https://github.com/aisamanra/s-cargot";
        description = "A flexible, extensible s-expression library";
@@ -164586,8 +166768,8 @@ self: {
      }:
      mkDerivation {
        pname = "safe-money";
-       version = "0.2";
-       sha256 = "0dhncpfhirz7l5jincav8zyixb8387k85kkjh4y17bc9cp1yca63";
+       version = "0.3";
+       sha256 = "0whd73vlkxzfr9rb9xfimxms56xzm0f1ninny16b4w6fg91ccqp5";
        libraryHaskellDepends = [
          aeson base binary cereal constraints deepseq hashable store
        ];
@@ -164596,7 +166778,7 @@ self: {
          store tasty tasty-hunit tasty-quickcheck
        ];
        homepage = "https://github.com/k0001/safe-money";
-       description = "Type-safe and lossless encoding and manipulation of money, world currencies and precious metals";
+       description = "Type-safe and lossless encoding and manipulation of money, fiat currencies, crypto currencies and precious metals";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -165039,7 +167221,9 @@ self: {
      }) {};
 
   "samtools" = callPackage
-    ({ mkDerivation, base, bytestring, c2hs, seqloc, vector, zlib }:
+    ({ mkDerivation, base, bytestring, c2hs, filepath, process, seqloc
+     , vector, zlib
+     }:
      mkDerivation {
        pname = "samtools";
        version = "0.2.4.3";
@@ -165049,6 +167233,9 @@ self: {
        libraryHaskellDepends = [ base bytestring seqloc vector ];
        librarySystemDepends = [ zlib ];
        libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [
+         base bytestring filepath process seqloc vector
+       ];
        executableSystemDepends = [ zlib ];
        executableToolDepends = [ c2hs ];
        homepage = "http://www.ingolia-lab.org/samtools-tutorial.html";
@@ -165094,7 +167281,8 @@ self: {
      }) {};
 
   "samtools-iteratee" = callPackage
-    ({ mkDerivation, base, bytestring, iteratee, samtools, transformers
+    ({ mkDerivation, base, bytestring, iteratee, monads-tf, samtools
+     , transformers
      }:
      mkDerivation {
        pname = "samtools-iteratee";
@@ -165105,6 +167293,9 @@ self: {
        libraryHaskellDepends = [
          base bytestring iteratee samtools transformers
        ];
+       executableHaskellDepends = [
+         base bytestring iteratee monads-tf samtools transformers
+       ];
        description = "Iteratee interface to SamTools library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -165386,8 +167577,8 @@ self: {
      }:
      mkDerivation {
        pname = "sbp";
-       version = "2.2.8";
-       sha256 = "1rldqn584zmlxa42fqqnr2idw82rmma9cfad7jl5ih5mb3hyii5g";
+       version = "2.2.9";
+       sha256 = "0cs9gdb24s7yvrhphjwlazqbmcmc5f3a7rk39svdijh31aagd5aj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -165457,27 +167648,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "sbv_6_1" = callPackage
-    ({ mkDerivation, array, async, base, base-compat, containers
-     , crackNum, data-binary-ieee754, deepseq, directory, filepath, ghc
-     , HUnit, mtl, old-time, pretty, process, QuickCheck, random, syb
+  "sbv_7_0" = callPackage
+    ({ mkDerivation, array, async, base, bytestring, containers
+     , crackNum, data-binary-ieee754, deepseq, directory, doctest
+     , filepath, generic-deriving, ghc, Glob, hlint, mtl, pretty
+     , process, QuickCheck, random, syb, tasty, tasty-golden
+     , tasty-hunit, template-haskell, time
      }:
      mkDerivation {
        pname = "sbv";
-       version = "6.1";
-       sha256 = "1a8wa2pgzd6z5bnndb6adzxcxyq1b6qlxwh8apjynqzbrhhjspn5";
-       isLibrary = true;
-       isExecutable = true;
+       version = "7.0";
+       sha256 = "1jqgzqhmcx015ja8nwpswq6akw9vrabmhhf709vfirgd9q8pgnjc";
        libraryHaskellDepends = [
-         array async base base-compat containers crackNum
-         data-binary-ieee754 deepseq directory filepath ghc mtl old-time
-         pretty process QuickCheck random syb
-       ];
-       executableHaskellDepends = [
-         base data-binary-ieee754 directory filepath HUnit process syb
+         array async base containers crackNum data-binary-ieee754 deepseq
+         directory filepath generic-deriving ghc mtl pretty process
+         QuickCheck random syb template-haskell time
        ];
        testHaskellDepends = [
-         base data-binary-ieee754 directory filepath HUnit syb
+         base bytestring data-binary-ieee754 directory doctest filepath Glob
+         hlint mtl random syb tasty tasty-golden tasty-hunit
+         template-haskell
        ];
        homepage = "http://leventerkok.github.com/sbv/";
        description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
@@ -165492,8 +167682,8 @@ self: {
      }:
      mkDerivation {
        pname = "sbvPlugin";
-       version = "0.8";
-       sha256 = "17zdx09aa4ikz7fmvdljq4130bx51wbkan97sn086nqqbkgm3v3i";
+       version = "0.9";
+       sha256 = "01fxnyi3jw952v7hlmf0isp88kv99jg6jll74cz2b04c461w1fhv";
        libraryHaskellDepends = [
          base containers ghc ghc-prim mtl sbv template-haskell
        ];
@@ -165915,8 +168105,9 @@ self: {
          split syb tagsoup text time vector xml-conduit yaml
        ];
        executableHaskellDepends = [
-         aeson aeson-pretty attoparsec base bytestring filepath
-         scholdoc-types syb text yaml
+         aeson aeson-pretty attoparsec base bytestring containers directory
+         filepath process scholdoc scholdoc-types syb temporary text vector
+         yaml
        ];
        testHaskellDepends = [
          aeson base bytestring directory filepath process scholdoc
@@ -165930,8 +168121,8 @@ self: {
 
   "scholdoc-texmath" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , mtl, parsec, process, scholdoc-types, split, syb, temporary, text
-     , utf8-string, xml
+     , mtl, network-uri, parsec, process, scholdoc-types, split, syb
+     , temporary, text, utf8-string, xml
      }:
      mkDerivation {
        pname = "scholdoc-texmath";
@@ -165942,6 +168133,7 @@ self: {
        libraryHaskellDepends = [
          base containers mtl parsec scholdoc-types syb xml
        ];
+       executableHaskellDepends = [ network-uri ];
        testHaskellDepends = [
          base bytestring directory filepath process split temporary text
          utf8-string xml
@@ -166900,8 +169092,8 @@ self: {
      }:
      mkDerivation {
        pname = "seakale-tests";
-       version = "0.1.0.2";
-       sha256 = "0a9cbmwy1i3ij0nzgzm340klds4f4b4f7aqb4q7h7sl6j096zg3h";
+       version = "0.1.1.0";
+       sha256 = "01famrx8xvfd8byikhliyrfhml91j264bnq456sxxwkmzs7gpy1n";
        libraryHaskellDepends = [
          base bytestring free mtl recursion-schemes seakale
        ];
@@ -167506,7 +169698,10 @@ self: {
      }) {};
 
   "semiring" = callPackage
-    ({ mkDerivation, base, Boolean, containers, monoids }:
+    ({ mkDerivation, base, Boolean, containers, HUnit, monoids
+     , QuickCheck, test-framework, test-framework-hunit
+     , test-framework-quickcheck2
+     }:
      mkDerivation {
        pname = "semiring";
        version = "0.3";
@@ -167514,6 +169709,10 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base Boolean containers monoids ];
+       executableHaskellDepends = [
+         base Boolean containers HUnit monoids QuickCheck test-framework
+         test-framework-hunit test-framework-quickcheck2
+       ];
        homepage = "http://github.com/srush/SemiRings/tree/master";
        description = "Semirings, ring-like structures used for dynamic programming applications";
        license = stdenv.lib.licenses.bsd3;
@@ -167665,17 +169864,18 @@ self: {
   "sensu-run" = callPackage
     ({ mkDerivation, aeson, base, bytestring, filepath, http-client
      , http-types, lens, network, optparse-applicative, process
-     , temporary, text, time, unix, vector, wreq
+     , temporary, text, time, unix, unix-compat, vector, wreq
      }:
      mkDerivation {
        pname = "sensu-run";
-       version = "0.2.0";
-       sha256 = "066pi6smcvffs7gsl1l45r2dshkw570p6h4s4nwsp5skf6k3568r";
+       version = "0.3.0";
+       sha256 = "0p22069kvfj1fl5s26l9lvijbxzvdf58rkj3bdfrrw76l941shwm";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          aeson base bytestring filepath http-client http-types lens network
-         optparse-applicative process temporary text time unix vector wreq
+         optparse-applicative process temporary text time unix unix-compat
+         vector wreq
        ];
        homepage = "https://github.com/maoe/sensu-run#readme";
        description = "A tool to send command execution results to Sensu";
@@ -167880,7 +170080,7 @@ self: {
          attoparsec base biocore bytestring cmdtheline conduit conduit-extra
          filepath hashable iteratee lifted-base monads-tf pretty QuickCheck
          random resourcet seqloc transformers transformers-base
-         unordered-containers
+         unordered-containers vector
        ];
        testHaskellDepends = [
          attoparsec base biocore bytestring conduit conduit-extra directory
@@ -167916,6 +170116,7 @@ self: {
        libraryHaskellDepends = [
          base bytestring containers ghc transformers
        ];
+       executableHaskellDepends = [ base bytestring containers ];
        homepage = "https://github.com/lukemaurer/sequent-core";
        description = "Alternative Core language for GHC plugins";
        license = stdenv.lib.licenses.bsd3;
@@ -168620,6 +170821,8 @@ self: {
        pname = "servant-cassava";
        version = "0.9";
        sha256 = "08g1yjrfx2q79r0ldjnxr05437bg889virfy52i3s66d5h69d9q3";
+       revision = "1";
+       editedCabalFile = "04rzz2a310q4jkr94j7j7scmyvc0ms7vw285jq2dv2r9g7gwdb3s";
        libraryHaskellDepends = [
          base base-compat bytestring cassava http-media servant vector
        ];
@@ -168631,9 +170834,10 @@ self: {
 
   "servant-checked-exceptions" = callPackage
     ({ mkDerivation, aeson, base, bytestring, deepseq, doctest, Glob
-     , hspec-wai, http-media, profunctors, servant, servant-client
-     , servant-docs, servant-server, tagged, tasty, tasty-hspec
-     , tasty-hunit, text, wai
+     , hspec-wai, http-api-data, http-client, http-media
+     , natural-transformation, optparse-applicative, profunctors
+     , servant, servant-client, servant-docs, servant-server, tagged
+     , tasty, tasty-hspec, tasty-hunit, text, wai, warp
      }:
      mkDerivation {
        pname = "servant-checked-exceptions";
@@ -168645,6 +170849,11 @@ self: {
          aeson base bytestring deepseq http-media profunctors servant
          servant-client servant-docs servant-server tagged text
        ];
+       executableHaskellDepends = [
+         aeson base http-api-data http-client natural-transformation
+         optparse-applicative servant servant-client servant-docs
+         servant-server text wai warp
+       ];
        testHaskellDepends = [
          base bytestring doctest Glob hspec-wai servant servant-server tasty
          tasty-hspec tasty-hunit wai
@@ -168766,6 +170975,10 @@ self: {
          base bytestring containers postgresql-query postgresql-simple
          servant servant-db text
        ];
+       executableHaskellDepends = [
+         base bytestring monad-logger postgresql-query servant-db time
+         transformers-base
+       ];
        testHaskellDepends = [
          base bytestring derive hspec HUnit monad-logger
          optparse-applicative postgresql-query QuickCheck
@@ -168806,7 +171019,7 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
-  "servant-docs_0_10_0_1" = callPackage
+  "servant-docs_0_11" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
      , case-insensitive, control-monad-omega, hashable, hspec
      , http-media, http-types, lens, servant, string-conversions, text
@@ -168814,8 +171027,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-docs";
-       version = "0.10.0.1";
-       sha256 = "1lhfvlnpgliiv84pp0gjk1kzmrd66k9dsdxf1y7mwm4mq6r7qf7k";
+       version = "0.11";
+       sha256 = "02bzp1bcvc54cx0kcnnsqqiva7rwbrn46a7gdxzqqiqrmm0a0fm0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -168885,8 +171098,9 @@ self: {
      }) {};
 
   "servant-elm" = callPackage
-    ({ mkDerivation, aeson, base, Diff, elm-export, hspec, HUnit, lens
-     , servant, servant-foreign, text, wl-pprint-text
+    ({ mkDerivation, aeson, base, Diff, directory, elm-export, hspec
+     , HUnit, interpolate, lens, mockery, process, servant
+     , servant-foreign, text, wl-pprint-text
      }:
      mkDerivation {
        pname = "servant-elm";
@@ -168897,8 +171111,10 @@ self: {
        libraryHaskellDepends = [
          base elm-export lens servant servant-foreign text wl-pprint-text
        ];
+       executableHaskellDepends = [ base elm-export servant text ];
        testHaskellDepends = [
-         aeson base Diff elm-export hspec HUnit servant text
+         aeson base Diff directory elm-export hspec HUnit interpolate
+         mockery process servant text
        ];
        homepage = "http://github.com/mattjbray/servant-elm#readme";
        description = "Automatically derive Elm functions to query servant webservices";
@@ -169041,8 +171257,9 @@ self: {
      }) {};
 
   "servant-jquery" = callPackage
-    ({ mkDerivation, base, charset, hspec, hspec-expectations
-     , language-ecmascript, lens, servant, text
+    ({ mkDerivation, aeson, base, charset, filepath, hspec
+     , hspec-expectations, language-ecmascript, lens, servant
+     , servant-server, stm, text, transformers, warp
      }:
      mkDerivation {
        pname = "servant-jquery";
@@ -169051,6 +171268,9 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base charset lens servant text ];
+       executableHaskellDepends = [
+         aeson base filepath servant servant-server stm transformers warp
+       ];
        testHaskellDepends = [
          base hspec hspec-expectations language-ecmascript lens servant
        ];
@@ -169061,9 +171281,10 @@ self: {
      }) {};
 
   "servant-js" = callPackage
-    ({ mkDerivation, base, base-compat, charset, hspec
+    ({ mkDerivation, aeson, base, base-compat, charset, filepath, hspec
      , hspec-expectations, language-ecmascript, lens, QuickCheck
-     , servant, servant-foreign, text
+     , servant, servant-foreign, servant-server, stm, text, transformers
+     , warp
      }:
      mkDerivation {
        pname = "servant-js";
@@ -169076,6 +171297,10 @@ self: {
        libraryHaskellDepends = [
          base base-compat charset lens servant servant-foreign text
        ];
+       executableHaskellDepends = [
+         aeson base filepath lens servant servant-server stm transformers
+         warp
+       ];
        testHaskellDepends = [
          base base-compat hspec hspec-expectations language-ecmascript lens
          QuickCheck servant text
@@ -169189,6 +171414,8 @@ self: {
        pname = "servant-multipart";
        version = "0.10.0.1";
        sha256 = "1wba440qlcjw6h6k8qiycsfq26snfkmy0p45d51li704s4m3idcv";
+       revision = "1";
+       editedCabalFile = "1li09340kh4ak1nnqk0qxnwx2yngqwk3fj1c0824yrib29c65973";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -169241,16 +171468,17 @@ self: {
      }) {};
 
   "servant-pandoc" = callPackage
-    ({ mkDerivation, base, bytestring, http-media, lens, pandoc-types
-     , servant-docs, text, unordered-containers
+    ({ mkDerivation, base, bytestring, case-insensitive, http-media
+     , lens, pandoc-types, servant-docs, string-conversions, text
+     , unordered-containers
      }:
      mkDerivation {
        pname = "servant-pandoc";
-       version = "0.4.1.2";
-       sha256 = "0dv25j7jz2pn5ykv9jihk2qrhqqdawx19637aa76k5rv93lc5379";
+       version = "0.4.1.4";
+       sha256 = "0hsmbrn7i6zbwfw5j2l8qppnjx1cl2g0iksim514ajga6zfjm96j";
        libraryHaskellDepends = [
-         base bytestring http-media lens pandoc-types servant-docs text
-         unordered-containers
+         base bytestring case-insensitive http-media lens pandoc-types
+         servant-docs string-conversions text unordered-containers
        ];
        description = "Use Pandoc to render servant API documentation";
        license = stdenv.lib.licenses.mit;
@@ -169360,9 +171588,10 @@ self: {
      }) {};
 
   "servant-py" = callPackage
-    ({ mkDerivation, aeson, base, base-compat, bytestring, charset
-     , hspec, hspec-expectations, lens, QuickCheck, servant
-     , servant-foreign, text
+    ({ mkDerivation, aeson, base, base-compat, blaze-html, bytestring
+     , charset, filepath, hspec, hspec-expectations, lens, QuickCheck
+     , servant, servant-blaze, servant-foreign, servant-server, stm
+     , text, wai, warp
      }:
      mkDerivation {
        pname = "servant-py";
@@ -169373,6 +171602,10 @@ self: {
        libraryHaskellDepends = [
          aeson base bytestring charset lens servant servant-foreign text
        ];
+       executableHaskellDepends = [
+         aeson base blaze-html bytestring filepath servant servant-blaze
+         servant-foreign servant-server stm text wai warp
+       ];
        testHaskellDepends = [
          aeson base base-compat bytestring hspec hspec-expectations lens
          QuickCheck servant servant-foreign text
@@ -169623,7 +171856,7 @@ self: {
     ({ mkDerivation, base, blaze-html, bytestring, containers
      , directory, doctest, filepath, Glob, hspec-wai, http-media
      , semigroups, servant, servant-blaze, servant-server, tasty
-     , tasty-hspec, tasty-hunit, template-haskell, text, wai
+     , tasty-hspec, tasty-hunit, template-haskell, text, wai, warp
      }:
      mkDerivation {
        pname = "servant-static-th";
@@ -169636,6 +171869,35 @@ self: {
          semigroups servant servant-blaze servant-server template-haskell
          text
        ];
+       executableHaskellDepends = [ base servant-server wai warp ];
+       testHaskellDepends = [
+         base blaze-html bytestring directory doctest filepath Glob
+         hspec-wai servant servant-blaze servant-server tasty tasty-hspec
+         tasty-hunit wai
+       ];
+       homepage = "https://github.com/cdepillabout/servant-static-th";
+       description = "Embed a directory of static files in your Servant server";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "servant-static-th_0_1_0_4" = callPackage
+    ({ mkDerivation, base, blaze-html, bytestring, containers
+     , directory, doctest, filepath, Glob, hspec-wai, http-media
+     , semigroups, servant, servant-blaze, servant-server, tasty
+     , tasty-hspec, tasty-hunit, template-haskell, text, wai, warp
+     }:
+     mkDerivation {
+       pname = "servant-static-th";
+       version = "0.1.0.4";
+       sha256 = "029xm7znkqd5sh7yhrblf9marwyd29iiqnar4kaf6awllxxkk1aq";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base blaze-html bytestring containers directory filepath http-media
+         semigroups servant servant-blaze servant-server template-haskell
+         text
+       ];
+       executableHaskellDepends = [ base servant-server wai warp ];
        testHaskellDepends = [
          base blaze-html bytestring directory doctest filepath Glob
          hspec-wai servant servant-blaze servant-server tasty tasty-hspec
@@ -169644,6 +171906,7 @@ self: {
        homepage = "https://github.com/cdepillabout/servant-static-th";
        description = "Embed a directory of static files in your Servant server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-subscriber" = callPackage
@@ -169780,6 +172043,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-swagger-ui_0_2_4_3_0_20" = callPackage
+    ({ mkDerivation, aeson, base, base-compat, blaze-markup, bytestring
+     , directory, file-embed, filepath, http-media, lens, servant
+     , servant-blaze, servant-server, servant-swagger, swagger2
+     , template-haskell, text, transformers, transformers-compat, wai
+     , wai-app-static, warp
+     }:
+     mkDerivation {
+       pname = "servant-swagger-ui";
+       version = "0.2.4.3.0.20";
+       sha256 = "18qp908s0kjcz6dlvj2031kr8qjnzrgh2v92mdg4lwa1j7ddf0xn";
+       libraryHaskellDepends = [
+         base blaze-markup bytestring directory file-embed filepath
+         http-media servant servant-blaze servant-server servant-swagger
+         swagger2 template-haskell text transformers transformers-compat
+         wai-app-static
+       ];
+       testHaskellDepends = [
+         aeson base base-compat lens servant servant-server servant-swagger
+         swagger2 text transformers transformers-compat wai warp
+       ];
+       homepage = "https://github.com/phadej/servant-swagger-ui#readme";
+       description = "Servant swagger ui";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-yaml" = callPackage
     ({ mkDerivation, aeson, base, base-compat, bytestring, http-media
      , servant, servant-server, wai, warp, yaml
@@ -170433,7 +172723,9 @@ self: {
      }) {};
 
   "sexpr" = callPackage
-    ({ mkDerivation, base, base64-string, binary, bytestring, pretty }:
+    ({ mkDerivation, base, base64-string, binary, bytestring, pretty
+     , QuickCheck, random
+     }:
      mkDerivation {
        pname = "sexpr";
        version = "0.2.1";
@@ -170443,6 +172735,7 @@ self: {
        libraryHaskellDepends = [
          base base64-string binary bytestring pretty
        ];
+       executableHaskellDepends = [ QuickCheck random ];
        description = "S-expression printer and parser";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -171046,7 +173339,6 @@ self: {
        homepage = "https://github.com/anton-k/sharc";
        description = "Sandell Harmonic Archive. A collection of stable phases for all instruments in the orchestra.";
        license = stdenv.lib.licenses.bsd3;
-       broken = true;
      }) {};
 
   "shared-buffer" = callPackage
@@ -172355,8 +174647,8 @@ self: {
     ({ mkDerivation, base, fast-logger, mtl, text }:
      mkDerivation {
        pname = "simple-logger";
-       version = "0.0.3";
-       sha256 = "1hay2v40bnxl5liayssgsg28z835xv833smc974smxpayay05c2z";
+       version = "0.0.4";
+       sha256 = "0550in9vkgf78rxfkzcrna40mihmaqhlixysfz8n0rz0rhw0z9gk";
        libraryHaskellDepends = [ base fast-logger mtl text ];
        homepage = "https://github.com/agrafix/simple-logger#readme";
        description = "A very simple but efficient logging framework";
@@ -172385,6 +174677,7 @@ self: {
        homepage = "https://gitlab.com/haskell-hr/logging";
        description = "Logging effect to plug into the simple-effects framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-money" = callPackage
@@ -172632,6 +174925,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mtl parsec pretty ];
+       executableHaskellDepends = [ base mtl parsec pretty ];
        testHaskellDepends = [
          base HUnit mtl parsec pretty test-framework test-framework-hunit
        ];
@@ -173224,7 +175518,8 @@ self: {
      }) {};
 
   "sized-types" = callPackage
-    ({ mkDerivation, array, base, base-compat, containers, singletons
+    ({ mkDerivation, array, base, base-compat, containers, QuickCheck
+     , singletons
      }:
      mkDerivation {
        pname = "sized-types";
@@ -173237,6 +175532,8 @@ self: {
        libraryHaskellDepends = [
          array base base-compat containers singletons
        ];
+       executableHaskellDepends = [ base base-compat ];
+       testHaskellDepends = [ base QuickCheck ];
        homepage = "http://www.ittc.ku.edu/csdl/fpg/Tools";
        description = "Sized types in Haskell using the GHC Nat kind";
        license = stdenv.lib.licenses.bsd3;
@@ -173397,6 +175694,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "skip-list" = callPackage
+    ({ mkDerivation, base, criterion, tasty, tasty-hunit }:
+     mkDerivation {
+       pname = "skip-list";
+       version = "0.1.0.1";
+       sha256 = "1ndcrn0w7957n1sjcsziml1mgqbr6p4zvzh3nm2m8akaswi09dxh";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
+       benchmarkHaskellDepends = [ base criterion ];
+       homepage = "https://github.com/gmalecha/skip-list#readme";
+       description = "An implementation of pure skip lists";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "skulk" = callPackage
     ({ mkDerivation, base, hspec, QuickCheck }:
      mkDerivation {
@@ -173451,6 +175762,11 @@ self: {
          aeson base blaze-html bytestring case-insensitive containers
          directory filepath hxt mtl regex-pcre-builtin safe text utf8-string
        ];
+       executableHaskellDepends = [
+         aeson base blaze-html bytestring case-insensitive containers
+         directory filepath hxt pretty-show regex-pcre-builtin safe text
+         utf8-string
+       ];
        testHaskellDepends = [
          aeson base bytestring containers Diff directory filepath HUnit
          pretty-show random tasty tasty-golden tasty-hunit text
@@ -173482,6 +175798,11 @@ self: {
          containers directory filepath hxt mtl regex-pcre-builtin safe text
          utf8-string
        ];
+       executableHaskellDepends = [
+         aeson base binary blaze-html bytestring case-insensitive containers
+         directory filepath hxt pretty-show regex-pcre-builtin safe text
+         utf8-string
+       ];
        testHaskellDepends = [
          aeson base bytestring containers Diff directory filepath HUnit
          pretty-show random tasty tasty-golden tasty-hunit text
@@ -173797,6 +176118,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "slug_0_1_7" = callPackage
+    ({ mkDerivation, aeson, base, exceptions, hspec, http-api-data
+     , path-pieces, persistent, QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "slug";
+       version = "0.1.7";
+       sha256 = "1pkxcb2ip4mb6szmqz3g7m3m8qfrvknjr5ii0wnd0icbzm1q4vyp";
+       libraryHaskellDepends = [
+         aeson base exceptions http-api-data path-pieces persistent
+         QuickCheck text
+       ];
+       testHaskellDepends = [
+         base exceptions hspec http-api-data path-pieces QuickCheck text
+       ];
+       homepage = "https://github.com/mrkkrp/slug";
+       description = "Type-safe slugs for Yesod ecosystem";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "smallarray" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, hashable }:
      mkDerivation {
@@ -174489,8 +176831,8 @@ self: {
      }:
      mkDerivation {
        pname = "snap-error-collector";
-       version = "1.1.3";
-       sha256 = "1dbs1pww1xsfhfbddfxwxay5s3g4j0880hza83ck46n5kfgkm1rk";
+       version = "1.1.4";
+       sha256 = "0k9nddbqdd6c12vrl5pqsl02pv38bhcxk5j02sq8lx7pk05w0mam";
        libraryHaskellDepends = [
          async base containers lifted-base monad-loops snap stm time
          transformers
@@ -174647,6 +176989,13 @@ self: {
          io-streams-haproxy lifted-base mtl network old-locale
          openssl-streams snap-core text time unix unix-compat vector
        ];
+       executableHaskellDepends = [
+         attoparsec base blaze-builder bytestring bytestring-builder
+         case-insensitive clock containers directory HsOpenSSL io-streams
+         io-streams-haproxy lifted-base mtl network old-locale
+         openssl-streams snap-core text time transformers unix unix-compat
+         vector
+       ];
        testHaskellDepends = [
          attoparsec base base16-bytestring blaze-builder bytestring
          bytestring-builder case-insensitive clock containers deepseq
@@ -175830,6 +178179,24 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "snowtify" = callPackage
+    ({ mkDerivation, base, data-default, either, safe, safe-exceptions
+     , text, turtle
+     }:
+     mkDerivation {
+       pname = "snowtify";
+       version = "0.1.0.1";
+       sha256 = "1afwffg90fi91zb3srlynqjf3mbg6nm42mww4bhyrgsjjpjgxdc6";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base data-default either safe safe-exceptions text turtle
+       ];
+       homepage = "https://github.com/aiya000/hs-snowtify#README.md";
+       description = "snowtify send your result of `stack build` (`stack test`) to notify-daemon :dog2:";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "soap" = callPackage
     ({ mkDerivation, base, bytestring, conduit, configurator
      , data-default, exceptions, hspec, http-client, http-types, HUnit
@@ -175973,8 +178340,8 @@ self: {
      }:
      mkDerivation {
        pname = "socket-io";
-       version = "1.3.7";
-       sha256 = "02pg1w4xidjw1j10f8mdiiincg0h7qm39a1dpgk51s8icwm2vndv";
+       version = "1.3.8";
+       sha256 = "08zwn8p1nkizgs8spdkdmw1xkfsz6ryviv8shnbc8mnpxfs6wl7q";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring engine-io mtl stm text
          transformers unordered-containers vector
@@ -176906,8 +179273,8 @@ self: {
     ({ mkDerivation, base, cmdargs, containers, leancheck }:
      mkDerivation {
        pname = "speculate";
-       version = "0.2.4";
-       sha256 = "050ygn51z6bziv36j4y47j9rxq5wdcyrn1b2fppsv718d51bpbvw";
+       version = "0.2.5";
+       sha256 = "1galy8k0nvnq4xavm15f6v160ili1kmiq5p2rdhqmfciadrxzxqd";
        libraryHaskellDepends = [ base cmdargs containers leancheck ];
        testHaskellDepends = [ base cmdargs containers leancheck ];
        benchmarkHaskellDepends = [ base cmdargs containers leancheck ];
@@ -178014,6 +180381,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base iproute text ];
+       executableHaskellDepends = [ base ];
        testHaskellDepends = [
          base HUnit iproute QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 text unix
@@ -178245,44 +180613,47 @@ self: {
      , attoparsec, base, base-compat, base64-bytestring, binary
      , binary-tagged, blaze-builder, bytestring, Cabal, clock, conduit
      , conduit-extra, containers, cryptonite, cryptonite-conduit
-     , deepseq, directory, either, errors, exceptions, extra
+     , deepseq, directory, echo, either, errors, exceptions, extra
      , fast-logger, file-embed, filelock, filepath, fsnotify
-     , generic-deriving, gitrev, hackage-security, hashable, hastache
-     , hit, hpack, hpc, hspec, http-client, http-client-tls
+     , generic-deriving, ghc-prim, gitrev, hackage-security, hashable
+     , hastache, hpack, hpc, hspec, http-client, http-client-tls
      , http-conduit, http-types, lifted-async, lifted-base, memory
-     , microlens, microlens-mtl, monad-control, monad-logger
+     , microlens, microlens-mtl, mintty, monad-control, monad-logger
      , monad-unlift, mono-traversable, mtl, neat-interpolation
      , network-uri, open-browser, optparse-applicative, optparse-simple
      , path, path-io, persistent, persistent-sqlite, persistent-template
      , pid1, pretty, process, project-template, QuickCheck
      , regex-applicative-text, resourcet, retry, safe, safe-exceptions
-     , semigroups, smallcheck, split, stm, store, streaming-commons, tar
-     , template-haskell, temporary, text, text-binary, text-metrics
-     , th-reify-many, time, tls, transformers, transformers-base
-     , unicode-transforms, unix, unix-compat, unordered-containers
-     , vector, vector-binary-instances, yaml, zip-archive, zlib
+     , semigroups, smallcheck, split, stm, store, store-core
+     , streaming-commons, tar, template-haskell, temporary, text
+     , text-binary, text-metrics, th-reify-many, time, tls, transformers
+     , transformers-base, unicode-transforms, unix, unix-compat
+     , unordered-containers, vector, vector-binary-instances, yaml
+     , zip-archive, zlib
      }:
      mkDerivation {
        pname = "stack";
-       version = "1.4.0";
-       sha256 = "1dp8377a0wy8j7v9j3qb2lbic7y3p49glq8z7vd85rm0381ny3gi";
-       revision = "4";
-       editedCabalFile = "0hs3rlgbm088fjgi28h5fay3zl1s00ljnqhgd0xafcqk2asmqq0k";
+       version = "1.5.0";
+       sha256 = "1wx3p4n28mf6g4iydnsjvm87hn43kqsmn52npmsyym54wsl2vzx9";
+       revision = "1";
+       editedCabalFile = "161v9lsi6xacbz279bhclmhn0vmv24a0badawm17rqhq4w8lh4yq";
        isLibrary = true;
        isExecutable = true;
+       setupHaskellDepends = [ base Cabal filepath ];
        libraryHaskellDepends = [
          aeson annotated-wl-pprint ansi-terminal async attoparsec base
          base-compat base64-bytestring binary binary-tagged blaze-builder
          bytestring Cabal clock conduit conduit-extra containers cryptonite
-         cryptonite-conduit deepseq directory either errors exceptions extra
-         fast-logger file-embed filelock filepath fsnotify generic-deriving
-         hackage-security hashable hastache hit hpack hpc http-client
-         http-client-tls http-conduit http-types lifted-async lifted-base
-         memory microlens microlens-mtl monad-control monad-logger
-         monad-unlift mtl network-uri open-browser optparse-applicative path
-         path-io persistent persistent-sqlite persistent-template pid1
-         pretty process project-template regex-applicative-text resourcet
-         retry safe safe-exceptions semigroups split stm store
+         cryptonite-conduit deepseq directory echo either errors exceptions
+         extra fast-logger file-embed filelock filepath fsnotify
+         generic-deriving ghc-prim hackage-security hashable hastache hpack
+         hpc http-client http-client-tls http-conduit http-types
+         lifted-async lifted-base memory microlens microlens-mtl mintty
+         monad-control monad-logger monad-unlift mtl network-uri
+         open-browser optparse-applicative path path-io persistent
+         persistent-sqlite persistent-template pid1 pretty process
+         project-template regex-applicative-text resourcet retry safe
+         safe-exceptions semigroups split stm store store-core
          streaming-commons tar template-haskell temporary text text-binary
          text-metrics time tls transformers transformers-base
          unicode-transforms unix unix-compat unordered-containers vector
@@ -178295,12 +180666,13 @@ self: {
          path path-io split text transformers
        ];
        testHaskellDepends = [
-         attoparsec base bytestring Cabal conduit conduit-extra containers
-         cryptonite directory exceptions filepath hashable hspec
+         async attoparsec base bytestring Cabal conduit conduit-extra
+         containers cryptonite directory exceptions filepath hashable hspec
          http-client-tls http-conduit monad-logger mono-traversable
-         neat-interpolation optparse-applicative path path-io QuickCheck
-         resourcet retry smallcheck store template-haskell temporary text
-         th-reify-many transformers unordered-containers vector yaml
+         neat-interpolation optparse-applicative path path-io process
+         QuickCheck resourcet retry smallcheck store template-haskell
+         temporary text th-reify-many transformers unix-compat
+         unordered-containers vector yaml
        ];
        doCheck = false;
        preCheck = "export HOME=$TMPDIR";
@@ -178337,6 +180709,7 @@ self: {
        homepage = "https://github.com/yamadapc/stack-bump";
        description = "Dead simple version bumping for hpack packages";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stack-hpc-coveralls" = callPackage
@@ -179309,7 +181682,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
-         base bytestring Cabal filepath hspec QuickCheck semigroups text
+         base bytestring Cabal filepath hspec http-client http-client-tls
+         QuickCheck semigroups text
        ];
        homepage = "https://github.com/debug-ito/staversion";
        description = "What version is the package X in stackage lts-Y.ZZ?";
@@ -179494,8 +181868,8 @@ self: {
 
   "stgi" = callPackage
     ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, containers
-     , deepseq, parsers, QuickCheck, semigroups, smallcheck, tasty
-     , tasty-html, tasty-hunit, tasty-quickcheck, tasty-rerun
+     , deepseq, doctest, parsers, QuickCheck, semigroups, smallcheck
+     , tasty, tasty-html, tasty-hunit, tasty-quickcheck, tasty-rerun
      , tasty-smallcheck, template-haskell, text, th-lift, transformers
      , trifecta
      }:
@@ -179511,8 +181885,8 @@ self: {
        ];
        executableHaskellDepends = [ ansi-terminal base semigroups text ];
        testHaskellDepends = [
-         ansi-wl-pprint base containers deepseq QuickCheck semigroups
-         smallcheck tasty tasty-html tasty-hunit tasty-quickcheck
+         ansi-wl-pprint base containers deepseq doctest QuickCheck
+         semigroups smallcheck tasty tasty-html tasty-hunit tasty-quickcheck
          tasty-rerun tasty-smallcheck template-haskell text
        ];
        homepage = "https://github.com/quchen/stgi#readme";
@@ -180053,7 +182427,9 @@ self: {
      }) {};
 
   "storablevector-streamfusion" = callPackage
-    ({ mkDerivation, base, storablevector, stream-fusion, utility-ht }:
+    ({ mkDerivation, base, binary, bytestring, old-time, storablevector
+     , stream-fusion, utility-ht
+     }:
      mkDerivation {
        pname = "storablevector-streamfusion";
        version = "0.0";
@@ -180063,65 +182439,15 @@ self: {
        libraryHaskellDepends = [
          base storablevector stream-fusion utility-ht
        ];
+       executableHaskellDepends = [
+         base binary bytestring old-time stream-fusion
+       ];
        homepage = "http://www.haskell.org/haskellwiki/Storable_Vector";
        description = "Conversion between storablevector and stream-fusion lists with fusion";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "store_0_3_1" = callPackage
-    ({ mkDerivation, array, async, base, base-orphans
-     , base64-bytestring, bytestring, cereal, cereal-vector, conduit
-     , containers, contravariant, criterion, cryptohash, deepseq
-     , directory, filepath, free, ghc-prim, hashable, hspec
-     , hspec-smallcheck, integer-gmp, lifted-base, monad-control
-     , mono-traversable, network, primitive, resourcet, safe, semigroups
-     , smallcheck, store-core, streaming-commons, syb, template-haskell
-     , text, th-lift, th-lift-instances, th-orphans, th-reify-many
-     , th-utilities, time, transformers, unordered-containers, vector
-     , vector-binary-instances, void, weigh
-     }:
-     mkDerivation {
-       pname = "store";
-       version = "0.3.1";
-       sha256 = "146srr30sb1p1zbc2sz0m3zlrjakcm0gh5b32vjzcd3kmzmha47c";
-       libraryHaskellDepends = [
-         array async base base-orphans base64-bytestring bytestring conduit
-         containers contravariant cryptohash deepseq directory filepath free
-         ghc-prim hashable hspec hspec-smallcheck integer-gmp lifted-base
-         monad-control mono-traversable network primitive resourcet safe
-         semigroups smallcheck store-core streaming-commons syb
-         template-haskell text th-lift th-lift-instances th-orphans
-         th-reify-many th-utilities time transformers unordered-containers
-         vector void
-       ];
-       testHaskellDepends = [
-         array async base base-orphans base64-bytestring bytestring cereal
-         cereal-vector conduit containers contravariant criterion cryptohash
-         deepseq directory filepath free ghc-prim hashable hspec
-         hspec-smallcheck integer-gmp lifted-base monad-control
-         mono-traversable network primitive resourcet safe semigroups
-         smallcheck store-core streaming-commons syb template-haskell text
-         th-lift th-lift-instances th-orphans th-reify-many th-utilities
-         time transformers unordered-containers vector
-         vector-binary-instances void weigh
-       ];
-       benchmarkHaskellDepends = [
-         array async base base-orphans base64-bytestring bytestring conduit
-         containers contravariant criterion cryptohash deepseq directory
-         filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp
-         lifted-base monad-control mono-traversable network primitive
-         resourcet safe semigroups smallcheck store-core streaming-commons
-         syb template-haskell text th-lift th-lift-instances th-orphans
-         th-reify-many th-utilities time transformers unordered-containers
-         vector void
-       ];
-       homepage = "https://github.com/fpco/store#readme";
-       description = "Fast binary serialization";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "store" = callPackage
     ({ mkDerivation, array, async, base, base-orphans
      , base64-bytestring, bytestring, cereal, cereal-vector, conduit
@@ -180175,23 +182501,6 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "store-core_0_3" = callPackage
-    ({ mkDerivation, base, bytestring, fail, ghc-prim, primitive, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "store-core";
-       version = "0.3";
-       sha256 = "11vha2c3vlv640s8anfmvvsvg81ldzx7swlqvf8hlcaacc5j74w7";
-       libraryHaskellDepends = [
-         base bytestring fail ghc-prim primitive text transformers
-       ];
-       homepage = "https://github.com/fpco/store#readme";
-       description = "Fast and lightweight binary serialization";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "store-core" = callPackage
     ({ mkDerivation, base, bytestring, fail, ghc-prim, primitive, text
      , transformers
@@ -180241,6 +182550,10 @@ self: {
          aeson aeson-pretty base bytestring hashable lens template-haskell
          text unordered-containers
        ];
+       executableHaskellDepends = [
+         aeson aeson-pretty base bytestring hashable lens template-haskell
+         text unordered-containers
+       ];
        testHaskellDepends = [
          aeson aeson-pretty base bytestring directory hashable hlint lens
          tasty tasty-hspec template-haskell text unordered-containers
@@ -180250,6 +182563,35 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "stratosphere_0_7_0" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
+     , hashable, hlint, hspec, hspec-discover, lens, template-haskell
+     , text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "stratosphere";
+       version = "0.7.0";
+       sha256 = "16x19sz4wq4kd12krdk1pmavma9l69x0yq4j2q657zqvmhy1izfh";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-pretty base bytestring hashable lens template-haskell
+         text unordered-containers
+       ];
+       executableHaskellDepends = [
+         aeson aeson-pretty base bytestring hashable lens template-haskell
+         text unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson aeson-pretty base bytestring directory hashable hlint hspec
+         hspec-discover lens template-haskell text unordered-containers
+       ];
+       homepage = "https://github.com/frontrowed/stratosphere#readme";
+       description = "EDSL for AWS CloudFormation";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "stratum-tool" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, bytestring-builder
      , cmdargs, connection, containers, curl, curl-aeson, network, stm
@@ -180505,6 +182847,7 @@ self: {
        ];
        description = "Cassava support for the streaming ecosystem";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "streaming-commons" = callPackage
@@ -180633,6 +182976,29 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "streaming-osm" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers
+     , criterion, streaming, streaming-bytestring, streaming-utils
+     , tasty, tasty-hunit, text, transformers, vector, zlib
+     }:
+     mkDerivation {
+       pname = "streaming-osm";
+       version = "1.0.0";
+       sha256 = "1z1wpwmsgc4viy0w3zcmf5d88nylyynb359r1p2naajg65kbb46h";
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers streaming
+         streaming-bytestring streaming-utils text transformers vector zlib
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring streaming tasty tasty-hunit vector zlib
+       ];
+       benchmarkHaskellDepends = [
+         attoparsec base bytestring criterion streaming vector zlib
+       ];
+       description = "A hand-written streaming byte parser for OpenStreetMap Protobuf data";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "streaming-png" = callPackage
     ({ mkDerivation, base, bytestring, cereal, exceptions, JuicyPixels
      , mmorph, mtl, resourcet, streaming, streaming-bytestring
@@ -180661,8 +183027,8 @@ self: {
      }:
      mkDerivation {
        pname = "streaming-postgresql-simple";
-       version = "0.2.0.0";
-       sha256 = "15aiddyi5rykg1m47a0y725yfxv1jyl9n07x5fbp3jgk3j75h01f";
+       version = "0.2.0.1";
+       sha256 = "1ffsxwgsaxqnf49n4lnyrh2zy6q9zc1i3ssd03m08ip813pk5j8k";
        libraryHaskellDepends = [
          base bytestring exceptions postgresql-libpq postgresql-simple
          resourcet safe-exceptions streaming transformers
@@ -181461,9 +183827,9 @@ self: {
     ({ mkDerivation, array, base, bytestring, containers, contravariant
      , criterion, deepseq, directory, doctest, filepath, free, ghc
      , ghc-prim, hashable, hlint, hybrid-vectors, lens, monad-st
-     , MonadRandom, parallel, primitive, QuickCheck, semigroups, tasty
-     , tasty-quickcheck, tasty-th, transformers, unordered-containers
-     , vector, vector-algorithms
+     , MonadRandom, mwc-random, parallel, primitive, QuickCheck
+     , semigroups, tasty, tasty-quickcheck, tasty-th, transformers
+     , unordered-containers, vector, vector-algorithms
      }:
      mkDerivation {
        pname = "structures";
@@ -181480,7 +183846,7 @@ self: {
          unordered-containers
        ];
        benchmarkHaskellDepends = [
-         array base containers criterion deepseq MonadRandom
+         array base containers criterion deepseq MonadRandom mwc-random
          unordered-containers vector
        ];
        homepage = "http://github.com/ekmett/structures";
@@ -182543,8 +184909,8 @@ self: {
      }:
      mkDerivation {
        pname = "swish";
-       version = "0.9.1.8";
-       sha256 = "1jilcrb1r94kvlwwrj59y72qmvnvnwi1cbk5i5xafw5h4y5qx3s9";
+       version = "0.9.1.9";
+       sha256 = "173qvx46als9ar63j6hqynnwnkvs12pb2qv3gbfjm8mla5i7sjym";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -183164,9 +185530,10 @@ self: {
 
   "synthesizer" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
-     , event-list, filepath, gnuplot, non-negative, numeric-prelude
-     , numeric-quest, process, QuickCheck, random, sox, storable-record
-     , storablevector, transformers, utility-ht
+     , directory, event-list, filepath, gnuplot, non-negative
+     , numeric-prelude, numeric-quest, old-time, process, QuickCheck
+     , random, sox, storable-record, storablevector, transformers
+     , utility-ht
      }:
      mkDerivation {
        pname = "synthesizer";
@@ -183179,6 +185546,7 @@ self: {
          non-negative numeric-prelude numeric-quest process QuickCheck
          random sox storable-record storablevector transformers utility-ht
        ];
+       executableHaskellDepends = [ directory old-time ];
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Audio signal processing coded in Haskell";
        license = "GPL";
@@ -183571,6 +185939,7 @@ self: {
        homepage = "https://github.com/erikd/system-linux-proc";
        description = "A library for accessing the /proc filesystem in Linux";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "system-locale" = callPackage
@@ -183696,6 +186065,10 @@ self: {
          template-haskell
        ];
        librarySystemDepends = [ libossp_uuid ];
+       executableHaskellDepends = [
+         base binary bytestring containers murmur-hash parsec
+         template-haskell
+       ];
        executableSystemDepends = [ libossp_uuid ];
        homepage = "http://github.com/solidsnack/system-uuid/";
        description = "Bindings to system UUID functions";
@@ -184089,6 +186462,7 @@ self: {
          base bytestring containers data-accessor explicit-exception
          non-empty transformers utility-ht xml-basic
        ];
+       executableHaskellDepends = [ base xml-basic ];
        testHaskellDepends = [ base xml-basic ];
        benchmarkHaskellDepends = [
          base bytestring containers data-accessor explicit-exception
@@ -184551,7 +186925,9 @@ self: {
      }) {};
 
   "takusen-oracle" = callPackage
-    ({ mkDerivation, base, clntsh, mtl, old-time, time }:
+    ({ mkDerivation, base, clntsh, mtl, old-time, QuickCheck, random
+     , time
+     }:
      mkDerivation {
        pname = "takusen-oracle";
        version = "0.9.4.1";
@@ -184560,6 +186936,9 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base mtl old-time time ];
        librarySystemDepends = [ clntsh ];
+       executableHaskellDepends = [
+         base mtl old-time QuickCheck random time
+       ];
        homepage = "https://github.com/paulrzcz/takusen-oracle.git";
        description = "Database library with left-fold interface for Oracle";
        license = stdenv.lib.licenses.bsd3;
@@ -184883,6 +187262,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tasty_0_11_2_3" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, clock, containers
+     , deepseq, mtl, optparse-applicative, regex-tdfa, stm, tagged
+     , unbounded-delays
+     }:
+     mkDerivation {
+       pname = "tasty";
+       version = "0.11.2.3";
+       sha256 = "0rsi8k3snw37nc196d59spmsp2xnmhbfbiqdb475qdg7a2i922k1";
+       libraryHaskellDepends = [
+         ansi-terminal async base clock containers deepseq mtl
+         optparse-applicative regex-tdfa stm tagged unbounded-delays
+       ];
+       homepage = "https://github.com/feuerbach/tasty";
+       description = "Modern and extensible testing framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-ant-xml" = callPackage
     ({ mkDerivation, base, containers, directory, filepath
      , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers
@@ -185332,6 +187730,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tasty-rerun_1_1_7" = callPackage
+    ({ mkDerivation, base, containers, mtl, optparse-applicative
+     , reducers, split, stm, tagged, tasty, transformers
+     }:
+     mkDerivation {
+       pname = "tasty-rerun";
+       version = "1.1.7";
+       sha256 = "18hz1xqinf59mzvd68ygj9333v0a32qxfcas7crn4iniq5zv71kj";
+       libraryHaskellDepends = [
+         base containers mtl optparse-applicative reducers split stm tagged
+         tasty transformers
+       ];
+       homepage = "http://github.com/ocharles/tasty-rerun";
+       description = "Run tests by filtering the test tree depending on the result of previous test runs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-silver" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
      , deepseq, directory, filepath, mtl, optparse-applicative, process
@@ -185563,15 +187979,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "tcp-streams_1_0_0_0" = callPackage
+  "tcp-streams_1_0_1_0" = callPackage
     ({ mkDerivation, base, bytestring, data-default-class, directory
      , HUnit, io-streams, network, pem, test-framework
      , test-framework-hunit, tls, x509, x509-store, x509-system
      }:
      mkDerivation {
        pname = "tcp-streams";
-       version = "1.0.0.0";
-       sha256 = "1f00r9650pb90zkk7mv12i9s8gapwn00krb9b6zl3wcqm4gjaizb";
+       version = "1.0.1.0";
+       sha256 = "0qa8dvlxg6r7f6qxq46xj1fq5ksbvznjqs624v57ay2nvgji5n3p";
        libraryHaskellDepends = [
          base bytestring data-default-class io-streams network pem tls x509
          x509-store x509-system
@@ -185611,15 +188027,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "tcp-streams-openssl_1_0_0_0" = callPackage
+  "tcp-streams-openssl_1_0_1_0" = callPackage
     ({ mkDerivation, base, bytestring, HsOpenSSL, HsOpenSSL-x509-system
      , HUnit, io-streams, network, tcp-streams, test-framework
      , test-framework-hunit
      }:
      mkDerivation {
        pname = "tcp-streams-openssl";
-       version = "1.0.0.0";
-       sha256 = "0irgybnlzi3a34252s3y3j2y8qddpisk1vadw271mmhzmifdx7bp";
+       version = "1.0.1.0";
+       sha256 = "1zka2hmx0659f6w9xnh13i53pfwhky833ifwm63sr3rlly5miry3";
        libraryHaskellDepends = [
          base bytestring HsOpenSSL HsOpenSSL-x509-system io-streams network
          tcp-streams
@@ -185716,8 +188132,8 @@ self: {
      }:
      mkDerivation {
        pname = "tdoc";
-       version = "0.4.6";
-       sha256 = "0gslj3z3lnh2wl7ljg8rza6kmmgfmgv94hgla75nblirvyka8v48";
+       version = "0.4.7";
+       sha256 = "06f9cbl123g0k9xqmy73l3x468ni120faj9slc806ncwalhjn67s";
        libraryHaskellDepends = [
          base bytestring template-haskell transformers xhtml
        ];
@@ -185952,12 +188368,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "template-haskell_2_11_1_0" = callPackage
+  "template-haskell_2_12_0_0" = callPackage
     ({ mkDerivation, base, ghc-boot-th, pretty }:
      mkDerivation {
        pname = "template-haskell";
-       version = "2.11.1.0";
-       sha256 = "171ngdd93i9prp9d5a4ix0alp30ahw2dvdk7i8in9mzscnv41csz";
+       version = "2.12.0.0";
+       sha256 = "0lbmqagknkdrj9mwqdd5p12ay78wk0g509g75a243jrbm46i6dar";
        libraryHaskellDepends = [ base ghc-boot-th pretty ];
        description = "Support library for Template Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -187088,8 +189504,8 @@ self: {
      }) {};
 
   "testbench" = callPackage
-    ({ mkDerivation, base, bytestring, cassava, criterion, deepseq
-     , dlist, HUnit, optparse-applicative, process, resourcet
+    ({ mkDerivation, base, bytestring, cassava, containers, criterion
+     , deepseq, dlist, HUnit, optparse-applicative, process, resourcet
      , statistics, streaming, streaming-bytestring, streaming-cassava
      , temporary, transformers, weigh
      }:
@@ -187104,8 +189520,12 @@ self: {
          optparse-applicative process resourcet statistics streaming
          streaming-bytestring streaming-cassava temporary transformers weigh
        ];
+       executableHaskellDepends = [
+         base bytestring containers criterion HUnit
+       ];
        description = "Create tests and benchmarks together";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "testing-feat" = callPackage
@@ -187233,8 +189653,8 @@ self: {
 
   "texmath" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , mtl, pandoc-types, parsec, process, split, syb, temporary, text
-     , utf8-string, xml
+     , mtl, network-uri, pandoc-types, parsec, process, split, syb
+     , temporary, text, utf8-string, xml
      }:
      mkDerivation {
        pname = "texmath";
@@ -187245,6 +189665,7 @@ self: {
        libraryHaskellDepends = [
          base containers mtl pandoc-types parsec syb xml
        ];
+       executableHaskellDepends = [ network-uri ];
        testHaskellDepends = [
          base bytestring directory filepath process split temporary text
          utf8-string xml
@@ -189119,6 +191540,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "threads_0_5_1_5" = callPackage
+    ({ mkDerivation, base, Cabal, concurrent-extra, HUnit, stm
+     , test-framework, test-framework-hunit
+     }:
+     mkDerivation {
+       pname = "threads";
+       version = "0.5.1.5";
+       sha256 = "0phbspm8k2k6w66hv6ldccvy3kc4rjnspj0jwabiwklinkv7wpd1";
+       setupHaskellDepends = [ base Cabal ];
+       libraryHaskellDepends = [ base stm ];
+       testHaskellDepends = [
+         base concurrent-extra HUnit stm test-framework test-framework-hunit
+       ];
+       homepage = "https://github.com/basvandijk/threads";
+       description = "Fork threads and wait for their result";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "threads-extras" = callPackage
     ({ mkDerivation, base, stm, threads }:
      mkDerivation {
@@ -189183,6 +191623,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/ThreadScope";
        description = "A graphical tool for profiling parallel Haskell programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "threefish" = callPackage
@@ -189208,8 +191649,8 @@ self: {
      }:
      mkDerivation {
        pname = "threepenny-editors";
-       version = "0.3.0";
-       sha256 = "090nhbb4yzjjmbbh1n48mi5i2kkky7s4kjwvmvbgf1694yjbb5ss";
+       version = "0.4.1";
+       sha256 = "1fzipaqzhayqg581r4p02byxxxql8ydsyxpwdhvqw738a46afqxg";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -189245,7 +191686,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "threepenny-gui_0_8_0_0" = callPackage
+  "threepenny-gui_0_8_0_1" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
      , data-default, deepseq, exceptions, filepath, hashable
      , network-uri, safe, snap-core, snap-server, stm, template-haskell
@@ -189254,8 +191695,8 @@ self: {
      }:
      mkDerivation {
        pname = "threepenny-gui";
-       version = "0.8.0.0";
-       sha256 = "1zlkmk0jf4njfc2zk61lvxmr0cy5pzlnrv7r5admy00ha04spnx1";
+       version = "0.8.0.1";
+       sha256 = "1jg18gmm4f3aamwz9vr3h8nc3axlxf2440zf0ff6h8dlp20al7zk";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -190092,14 +192533,14 @@ self: {
   "time-warp" = callPackage
     ({ mkDerivation, ansi-terminal, array, async, attoparsec, base
      , binary, binary-conduit, bytestring, conduit, conduit-extra
-     , containers, data-default, data-msgpack, deepseq, exceptions
-     , extra, formatting, hashable, hspec, lens, lifted-base, log-warper
-     , mmorph, monad-control, monad-loops, MonadRandom, mtl, network
-     , pqueue, QuickCheck, quickcheck-instances, random, safe
-     , semigroups, serokell-util, slave-thread, stm, stm-chans
-     , stm-conduit, streaming-commons, template-haskell, text
-     , text-format, time, time-units, transformers, transformers-base
-     , unordered-containers
+     , containers, data-default, data-msgpack, deepseq, directory
+     , exceptions, extra, formatting, hashable, hslogger, hspec, lens
+     , lifted-base, log-warper, mmorph, monad-control, monad-loops
+     , MonadRandom, mtl, network, optparse-simple, pqueue, QuickCheck
+     , quickcheck-instances, random, resourcet, safe, semigroups
+     , serokell-util, slave-thread, stm, stm-chans, stm-conduit
+     , streaming-commons, template-haskell, text, text-format, time
+     , time-units, transformers, transformers-base, unordered-containers
      }:
      mkDerivation {
        pname = "time-warp";
@@ -190117,6 +192558,14 @@ self: {
          streaming-commons template-haskell text text-format time time-units
          transformers transformers-base unordered-containers
        ];
+       executableHaskellDepends = [
+         async attoparsec base binary binary-conduit bytestring conduit
+         conduit-extra containers data-default data-msgpack directory
+         exceptions extra formatting hslogger hspec lens log-warper
+         monad-control monad-loops MonadRandom mtl optparse-simple
+         QuickCheck random resourcet serokell-util stm text text-format time
+         time-units transformers unordered-containers
+       ];
        testHaskellDepends = [
          async base data-default data-msgpack exceptions hspec lens
          log-warper mtl QuickCheck random serokell-util stm text text-format
@@ -190260,6 +192709,10 @@ self: {
          base containers focus hashable list-t stm stm-containers time
          unordered-containers
        ];
+       executableHaskellDepends = [
+         base containers focus hashable list-t stm stm-containers time
+         unordered-containers
+       ];
        testHaskellDepends = [
          base containers focus hashable list-t QuickCheck
          quickcheck-instances stm stm-containers tasty tasty-hunit
@@ -190800,12 +193253,12 @@ self: {
      }) {};
 
   "tkyprof" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, cmdargs
-     , conduit, conduit-extra, containers, data-default, directory
-     , exceptions, filepath, http-types, mtl, resourcet, rosezipper
-     , shakespeare, stm, template-haskell, text, time, transformers
-     , unordered-containers, vector, wai, wai-extra, warp, web-routes
-     , yesod, yesod-core, yesod-form, yesod-static
+    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
+     , cmdargs, conduit, conduit-extra, containers, data-default
+     , directory, exceptions, filepath, http-types, mtl, resourcet
+     , rosezipper, shakespeare, stm, template-haskell, text, time
+     , transformers, unordered-containers, vector, wai, wai-extra, warp
+     , web-routes, yesod, yesod-core, yesod-form, yesod-static
      }:
      mkDerivation {
        pname = "tkyprof";
@@ -190814,11 +193267,12 @@ self: {
        isLibrary = true;
        isExecutable = true;
        executableHaskellDepends = [
-         aeson attoparsec base bytestring cmdargs conduit conduit-extra
-         containers data-default directory exceptions filepath http-types
-         mtl resourcet rosezipper shakespeare stm template-haskell text time
-         transformers unordered-containers vector wai wai-extra warp
-         web-routes yesod yesod-core yesod-form yesod-static
+         aeson attoparsec base blaze-builder bytestring cmdargs conduit
+         conduit-extra containers data-default directory exceptions filepath
+         http-types mtl resourcet rosezipper shakespeare stm
+         template-haskell text time transformers unordered-containers vector
+         wai wai-extra warp web-routes yesod yesod-core yesod-form
+         yesod-static
        ];
        homepage = "https://github.com/maoe/tkyprof";
        description = "A web-based visualizer for GHC Profiling Reports";
@@ -190945,6 +193399,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tls-session-manager_0_0_0_1" = callPackage
+    ({ mkDerivation, auto-update, base, clock, psqueues, tls }:
+     mkDerivation {
+       pname = "tls-session-manager";
+       version = "0.0.0.1";
+       sha256 = "0bqv6wh771j7n8qqsh02v8c4byybfkr1027k6cz03mszvnz1q9k8";
+       libraryHaskellDepends = [ auto-update base clock psqueues tls ];
+       description = "In-memory TLS session manager";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tmapchan" = callPackage
     ({ mkDerivation, base, containers, hashable, stm
      , unordered-containers
@@ -190988,8 +193454,8 @@ self: {
      }:
      mkDerivation {
        pname = "tmp-postgres";
-       version = "0.1.0.7";
-       sha256 = "0cx0b0743fv2p651sf6s95aqhpq8rk20mxdk06dw8v8bgdyvncq2";
+       version = "0.1.0.8";
+       sha256 = "11cs5cq99gxkfj0x14kkcsn6mnh9c7d8hw1kdj598fy1gic5c94n";
        libraryHaskellDepends = [
          base directory network process temporary unix
        ];
@@ -191236,7 +193702,8 @@ self: {
      }) {};
 
   "toktok" = callPackage
-    ({ mkDerivation, base, bytestring, containers, gf, haskell98, iconv
+    ({ mkDerivation, base, bytestring, containers, criterion, filepath
+     , gf, haskell98, HUnit, iconv, progression, QuickCheck
      }:
      mkDerivation {
        pname = "toktok";
@@ -191245,7 +193712,10 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers haskell98 ];
-       executableHaskellDepends = [ base bytestring gf iconv ];
+       executableHaskellDepends = [
+         base bytestring criterion filepath gf HUnit iconv progression
+         QuickCheck
+       ];
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -191537,11 +194007,11 @@ self: {
      , exceptions, extended-reals, filepath, finite-field, ghc-prim
      , hashable, haskeline, heaps, intern, loop, mtl, multiset
      , mwc-random, OptDir, parse-dimacs, parsec, prettyclass, primes
-     , process, pseudo-boolean, queue, QuickCheck, semigroups, sign, stm
-     , tasty, tasty-hunit, tasty-quickcheck, tasty-th, template-haskell
-     , temporary, time, transformers, transformers-compat
-     , type-level-numbers, unbounded-delays, unordered-containers
-     , vector, vector-space
+     , process, pseudo-boolean, queue, QuickCheck, semigroups, sign
+     , split, stm, tasty, tasty-hunit, tasty-quickcheck, tasty-th
+     , template-haskell, temporary, time, transformers
+     , transformers-compat, type-level-numbers, unbounded-delays
+     , unordered-containers, vector, vector-space
      }:
      mkDerivation {
        pname = "toysolver";
@@ -191563,7 +194033,7 @@ self: {
        executableHaskellDepends = [
          array base bytestring containers data-default-class filepath
          haskeline mtl mwc-random OptDir parse-dimacs parsec process
-         pseudo-boolean time transformers transformers-compat
+         pseudo-boolean split time transformers transformers-compat
          unbounded-delays vector vector-space
        ];
        testHaskellDepends = [
@@ -192551,6 +195021,10 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers mtl QuickCheck random ];
+       executableHaskellDepends = [
+         base containers mtl QuickCheck random
+       ];
+       testHaskellDepends = [ base containers mtl QuickCheck random ];
        homepage = "http://www.haskell.org/haskellwiki/Treeviz";
        description = "Visualization of computation decomposition trees";
        license = stdenv.lib.licenses.bsd3;
@@ -192943,8 +195417,8 @@ self: {
      }) {};
 
   "tsparse" = callPackage
-    ({ mkDerivation, base, Decimal, parsec, pretty, process, split
-     , time
+    ({ mkDerivation, base, Decimal, parsec, pretty, process, random
+     , split, time
      }:
      mkDerivation {
        pname = "tsparse";
@@ -192955,6 +195429,9 @@ self: {
        libraryHaskellDepends = [
          base Decimal parsec pretty process split time
        ];
+       executableHaskellDepends = [
+         base Decimal parsec pretty process random split time
+       ];
        homepage = "http://www.github.com/massysett/tsparse";
        description = "Parses U.S. federal Thrift Savings Plan PDF quarterly statements";
        license = stdenv.lib.licenses.bsd3;
@@ -193452,6 +195929,7 @@ self: {
        homepage = "https://github.com/vmchale/command-line-tweeter#readme";
        description = "Command-line tool for twitter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twentefp" = callPackage
@@ -195008,6 +197486,35 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "tz_0_1_3_0" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, criterion
+     , data-default, deepseq, HUnit, lens, QuickCheck, template-haskell
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , test-framework-th, thyme, time, timezone-olson, timezone-series
+     , tzdata, vector
+     }:
+     mkDerivation {
+       pname = "tz";
+       version = "0.1.3.0";
+       sha256 = "1h2w9pswfbnzpdm30xpgknhvfb1vs8ipyczpslrbsv6v6xhqh44p";
+       libraryHaskellDepends = [
+         base binary bytestring containers data-default deepseq
+         template-haskell time tzdata vector
+       ];
+       testHaskellDepends = [
+         base HUnit QuickCheck test-framework test-framework-hunit
+         test-framework-quickcheck2 test-framework-th time tzdata
+       ];
+       benchmarkHaskellDepends = [
+         base criterion lens thyme time timezone-olson timezone-series
+       ];
+       preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo";
+       homepage = "https://github.com/nilcons/haskell-tz";
+       description = "Efficient time zone handling";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tzdata" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, HUnit
      , test-framework, test-framework-hunit, test-framework-th, unix
@@ -195029,6 +197536,28 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "tzdata_0_1_20170320_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, deepseq, HUnit
+     , test-framework, test-framework-hunit, test-framework-th, unix
+     , vector
+     }:
+     mkDerivation {
+       pname = "tzdata";
+       version = "0.1.20170320.0";
+       sha256 = "11ffj8ipcvvsm811w1jm23ry7vrmvj2q487640ic4ghq39dx91is";
+       libraryHaskellDepends = [
+         base bytestring containers deepseq vector
+       ];
+       testHaskellDepends = [
+         base bytestring HUnit test-framework test-framework-hunit
+         test-framework-th unix
+       ];
+       homepage = "https://github.com/nilcons/haskell-tzdata";
+       description = "Time zone database (as files and as a module)";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "u2f" = callPackage
     ({ mkDerivation, aeson, asn1-encoding, asn1-types, base
      , base64-bytestring, binary, bytestring, cryptohash, cryptonite
@@ -195199,7 +197728,9 @@ self: {
      }) {};
 
   "udev" = callPackage
-    ({ mkDerivation, base, bytestring, libudev, posix-paths, unix }:
+    ({ mkDerivation, base, bytestring, libudev, posix-paths, select
+     , unix
+     }:
      mkDerivation {
        pname = "udev";
        version = "0.1.0.0";
@@ -195208,6 +197739,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring posix-paths unix ];
        libraryPkgconfigDepends = [ libudev ];
+       executableHaskellDepends = [ base bytestring select ];
        homepage = "https://github.com/pxqr/udev";
        description = "libudev bindings";
        license = stdenv.lib.licenses.bsd3;
@@ -195895,15 +198427,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "unicode-transforms_0_3_1" = callPackage
+  "unicode-transforms_0_3_2" = callPackage
     ({ mkDerivation, base, bitarray, bytestring, criterion, deepseq
      , filepath, getopt-generics, optparse-applicative, path, path-io
      , QuickCheck, split, text
      }:
      mkDerivation {
        pname = "unicode-transforms";
-       version = "0.3.1";
-       sha256 = "03n9s1pqgq9gl3q6xydwjlsvwq4al6khwd8lr137941263zxx0di";
+       version = "0.3.2";
+       sha256 = "15v5c0gn10k5im0x3b04z3hilwgafx6sk61hxmp0p36l1zqa5ch0";
        libraryHaskellDepends = [ base bitarray bytestring text ];
        testHaskellDepends = [
          base deepseq getopt-generics QuickCheck split text
@@ -196443,14 +198975,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "unix_2_7_2_1" = callPackage
+  "unix_2_7_2_2" = callPackage
     ({ mkDerivation, base, bytestring, time }:
      mkDerivation {
        pname = "unix";
-       version = "2.7.2.1";
-       sha256 = "1709ip8k1vahy00zi7v7qccw6rr22qrf3vk54h97jxrnjiakc1gw";
-       revision = "1";
-       editedCabalFile = "1m6gvvsb7ds25qws07wn6v3icksmh9g09qbrz726z8rnvvlbdc9x";
+       version = "2.7.2.2";
+       sha256 = "1b6ygkasn5bvmdci8g3zjkahl34kfqhf5jrayibvnrcdnaqlxpcq";
        libraryHaskellDepends = [ base bytestring time ];
        homepage = "https://github.com/haskell/unix";
        description = "POSIX functionality";
@@ -196485,7 +199015,7 @@ self: {
      }) {};
 
   "unix-fcntl" = callPackage
-    ({ mkDerivation, base, foreign-var }:
+    ({ mkDerivation, base, foreign-var, unix }:
      mkDerivation {
        pname = "unix-fcntl";
        version = "0.0.0";
@@ -196493,6 +199023,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base foreign-var ];
+       executableHaskellDepends = [ base foreign-var unix ];
        homepage = "https://github.com/maoe/unix-fcntl";
        description = "Comprehensive bindings to fcntl(2)";
        license = stdenv.lib.licenses.bsd3;
@@ -196820,6 +199351,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
        homepage = "http://github.com/konn/unsafely";
        description = "Flexible access control for unsafe operations and instances";
        license = stdenv.lib.licenses.bsd3;
@@ -197219,6 +199751,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "uri-parse" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, data-default, hspec
+     , http-types, lens, text
+     }:
+     mkDerivation {
+       pname = "uri-parse";
+       version = "0.1.0.0";
+       sha256 = "0wkqlnbfnzzqr6pw2f934w2z9x8hgghg4cwf3l5kazbaj25cangx";
+       libraryHaskellDepends = [
+         attoparsec base bytestring data-default http-types lens text
+       ];
+       testHaskellDepends = [ base data-default hspec lens ];
+       homepage = "https://github.com/luminescent-dreams/uri-parse#readme";
+       description = "A simple library for parsing and generating URIs";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "uri-template" = callPackage
     ({ mkDerivation, base, containers, utf8-string }:
      mkDerivation {
@@ -197410,6 +199959,7 @@ self: {
        homepage = "https://github.com/antalsz/urn-random";
        description = "A package for updatable discrete distributions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "urxml" = callPackage
@@ -198881,8 +201431,8 @@ self: {
      }) {};
 
   "vector-algorithms" = callPackage
-    ({ mkDerivation, base, bytestring, containers, primitive
-     , QuickCheck, vector
+    ({ mkDerivation, base, bytestring, containers, mtl, mwc-random
+     , primitive, QuickCheck, vector
      }:
      mkDerivation {
        pname = "vector-algorithms";
@@ -198893,6 +201443,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring primitive vector ];
+       executableHaskellDepends = [ base mtl mwc-random vector ];
        testHaskellDepends = [
          base bytestring containers QuickCheck vector
        ];
@@ -198973,8 +201524,8 @@ self: {
      }) {};
 
   "vector-bytestring" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, directory, ghc-prim
-     , primitive, QuickCheck, random, vector
+    ({ mkDerivation, base, bytestring, criterion, deepseq, directory
+     , ghc-prim, primitive, QuickCheck, random, vector
      }:
      mkDerivation {
        pname = "vector-bytestring";
@@ -198985,6 +201536,7 @@ self: {
        libraryHaskellDepends = [
          base bytestring deepseq ghc-prim primitive vector
        ];
+       executableHaskellDepends = [ base bytestring criterion deepseq ];
        testHaskellDepends = [ base directory QuickCheck random ];
        homepage = "https://github.com/basvandijk/vector-bytestring";
        description = "ByteStrings as type synonyms of Storable Vectors of Word8s";
@@ -199347,6 +201899,7 @@ self: {
        libraryHaskellDepends = [
          aeson base containers text unordered-containers vector verdict
        ];
+       executableHaskellDepends = [ aeson base containers verdict ];
        testHaskellDepends = [
          aeson base containers hspec unordered-containers vector verdict
        ];
@@ -199507,14 +202060,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "viewprof_0_0_0_5" = callPackage
+  "viewprof_0_0_0_6" = callPackage
     ({ mkDerivation, base, brick, containers, ghc-prof, lens
      , scientific, text, vector, vector-algorithms, vty
      }:
      mkDerivation {
        pname = "viewprof";
-       version = "0.0.0.5";
-       sha256 = "1i1rrr920dappcvj7gjs60bjcrznb4ny4aslvxxidv93lz9kv617";
+       version = "0.0.0.6";
+       sha256 = "0a9jbfa2sr3rvpp51kd9c3b9rax7b6wly4ly4dmn5k3z8fr0z31l";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -200088,6 +202641,42 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "vty_5_16" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
+     , deepseq, directory, filepath, hashable, HUnit, microlens
+     , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck
+     , quickcheck-assertions, random, smallcheck, stm, string-qq
+     , terminfo, test-framework, test-framework-hunit
+     , test-framework-smallcheck, text, transformers, unix, utf8-string
+     , vector
+     }:
+     mkDerivation {
+       pname = "vty";
+       version = "5.16";
+       sha256 = "1zxjr4g7xl50zhjpbzk1a16cp2i1k75abpkna2q37hy1ss6sw637";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base blaze-builder bytestring containers deepseq directory filepath
+         hashable microlens microlens-mtl microlens-th mtl parallel parsec
+         stm terminfo text transformers unix utf8-string vector
+       ];
+       executableHaskellDepends = [
+         base containers microlens microlens-mtl mtl
+       ];
+       testHaskellDepends = [
+         base blaze-builder bytestring Cabal containers deepseq HUnit
+         microlens microlens-mtl mtl QuickCheck quickcheck-assertions random
+         smallcheck stm string-qq terminfo test-framework
+         test-framework-hunit test-framework-smallcheck text unix
+         utf8-string vector
+       ];
+       homepage = "https://github.com/jtdaugherty/vty";
+       description = "A simple terminal UI library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "vty-examples" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, containers
      , data-default, deepseq, lens, mtl, parallel, parsec, QuickCheck
@@ -200125,9 +202714,9 @@ self: {
      }) {};
 
   "vty-ui" = callPackage
-    ({ mkDerivation, array, base, containers, data-default, directory
-     , filepath, mtl, QuickCheck, random, regex-base, stm, text, unix
-     , vector, vty
+    ({ mkDerivation, array, base, bytestring, containers, data-default
+     , directory, filepath, mtl, QuickCheck, random, regex-base, stm
+     , text, time, unix, vector, vty
      }:
      mkDerivation {
        pname = "vty-ui";
@@ -200139,7 +202728,9 @@ self: {
          array base containers data-default directory filepath mtl
          regex-base stm text unix vector vty
        ];
-       executableHaskellDepends = [ base QuickCheck random text vty ];
+       executableHaskellDepends = [
+         base bytestring mtl QuickCheck random text time vty
+       ];
        homepage = "http://jtdaugherty.github.com/vty-ui/";
        description = "An interactive terminal user interface library for Vty";
        license = stdenv.lib.licenses.bsd3;
@@ -200937,7 +203528,8 @@ self: {
     ({ mkDerivation, async, base, base-prelude, bytestring, conduit
      , conduit-extra, consul-haskell, enclosed-exceptions, http-client
      , http-types, monad-control, monad-logger, network, process
-     , resourcet, text, transformers, void, wai, wai-conduit
+     , resourcet, text, transformers, void, wai, wai-app-static
+     , wai-conduit, wai-extra, warp
      }:
      mkDerivation {
        pname = "wai-middleware-consul";
@@ -200951,6 +203543,10 @@ self: {
          monad-control monad-logger network process resourcet text
          transformers void wai wai-conduit
        ];
+       executableHaskellDepends = [
+         async base base-prelude monad-logger transformers wai
+         wai-app-static wai-extra warp
+       ];
        homepage = "https://github.com/fpco/wai-middleware-consul";
        description = "Wai Middleware for Consul";
        license = stdenv.lib.licenses.mit;
@@ -201105,6 +203701,9 @@ self: {
          cryptohash http-client http-types mtl old-locale time transformers
          word8
        ];
+       executableHaskellDepends = [
+         base bytestring http-client transformers
+       ];
        description = "WAI HMAC Authentication Middleware Client";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -201347,8 +203946,9 @@ self: {
 
   "wai-middleware-verbs" = callPackage
     ({ mkDerivation, base, errors, exceptions, hashable, http-types
-     , mmorph, monad-logger, mtl, resourcet, transformers
+     , mmorph, monad-logger, mtl, resourcet, text, transformers
      , transformers-base, unordered-containers, wai
+     , wai-middleware-content-type, wai-transformers, warp
      }:
      mkDerivation {
        pname = "wai-middleware-verbs";
@@ -201360,8 +203960,14 @@ self: {
          base errors exceptions hashable http-types mmorph monad-logger mtl
          resourcet transformers transformers-base unordered-containers wai
        ];
+       executableHaskellDepends = [
+         base errors exceptions hashable http-types mmorph monad-logger mtl
+         resourcet text transformers transformers-base unordered-containers
+         wai wai-middleware-content-type wai-transformers warp
+       ];
        description = "Route different middleware responses based on the incoming HTTP verb";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-predicates" = callPackage
@@ -201823,7 +204429,7 @@ self: {
   "waitra" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, filepath
      , http-types, regex-applicative, tasty, tasty-hunit
-     , template-haskell, text, wai, wai-extra
+     , template-haskell, text, wai, wai-app-static, wai-extra, warp
      }:
      mkDerivation {
        pname = "waitra";
@@ -201837,6 +204443,7 @@ self: {
          aeson base bytestring directory filepath http-types
          regex-applicative template-haskell text wai
        ];
+       executableHaskellDepends = [ aeson base wai wai-app-static warp ];
        testHaskellDepends = [
          aeson base http-types tasty tasty-hunit wai wai-extra
        ];
@@ -202023,8 +204630,8 @@ self: {
 
   "warp-tls-uid" = callPackage
     ({ mkDerivation, base, bytestring, certificate, conduit
-     , crypto-random, network, network-conduit, pem, tls, tls-extra
-     , unix, wai, warp
+     , crypto-random, http-types, network, network-conduit, pem, tls
+     , tls-extra, unix, wai, warp
      }:
      mkDerivation {
        pname = "warp-tls-uid";
@@ -202036,6 +204643,10 @@ self: {
          base bytestring certificate conduit crypto-random network
          network-conduit pem tls tls-extra unix wai warp
        ];
+       executableHaskellDepends = [
+         base bytestring certificate conduit crypto-random http-types
+         network network-conduit pem tls tls-extra unix wai warp
+       ];
        description = "set group and user id before running server";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -202211,7 +204822,9 @@ self: {
      }) {};
 
   "wcwidth" = callPackage
-    ({ mkDerivation, base, containers }:
+    ({ mkDerivation, attoparsec, base, bytestring, containers
+     , setlocale, utf8-string
+     }:
      mkDerivation {
        pname = "wcwidth";
        version = "0.0.2";
@@ -202219,6 +204832,9 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
+       executableHaskellDepends = [
+         attoparsec base bytestring containers setlocale utf8-string
+       ];
        homepage = "http://github.com/solidsnack/wcwidth/";
        description = "Native wcwidth";
        license = stdenv.lib.licenses.bsd3;
@@ -202469,6 +205085,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "web-routes-happstack_0_23_11" = callPackage
+    ({ mkDerivation, base, bytestring, happstack-server, text
+     , web-routes
+     }:
+     mkDerivation {
+       pname = "web-routes-happstack";
+       version = "0.23.11";
+       sha256 = "0jzxcwh3g6y5y4whjbw86y94hfrl73iwnwhhm728l69z5knqry9y";
+       libraryHaskellDepends = [
+         base bytestring happstack-server text web-routes
+       ];
+       description = "Adds support for using web-routes with Happstack";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "web-routes-hsp" = callPackage
     ({ mkDerivation, base, hsp, text, web-routes }:
      mkDerivation {
@@ -203030,6 +205662,10 @@ self: {
          attoparsec base base64-bytestring binary blaze-builder bytestring
          case-insensitive containers entropy network random SHA text
        ];
+       executableHaskellDepends = [
+         attoparsec base base64-bytestring binary blaze-builder bytestring
+         case-insensitive containers entropy network random SHA text
+       ];
        testHaskellDepends = [
          attoparsec base base64-bytestring binary blaze-builder bytestring
          case-insensitive containers entropy HUnit network QuickCheck random
@@ -203042,7 +205678,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "websockets_0_11_2_0" = callPackage
+  "websockets_0_12_1_0" = callPackage
     ({ mkDerivation, attoparsec, base, base64-bytestring, binary
      , blaze-builder, bytestring, case-insensitive, containers
      , criterion, entropy, HUnit, network, QuickCheck, random, SHA
@@ -203051,8 +205687,10 @@ self: {
      }:
      mkDerivation {
        pname = "websockets";
-       version = "0.11.2.0";
-       sha256 = "0bncy78zjyhb961lhiklg2d1zh6vh03xq1zjj9js8904p75kvbaq";
+       version = "0.12.1.0";
+       sha256 = "04c0bjzdz1l3n7hkfqhrxd16csnrlya2vjh96sgj9k6gwzj2cbsp";
+       revision = "1";
+       editedCabalFile = "1qnly23vdg76jm54d68jc7ssvlghkx4vi05a0vpmj4mi7b7mnxvq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -203060,6 +205698,10 @@ self: {
          case-insensitive containers entropy network random SHA
          streaming-commons text
        ];
+       executableHaskellDepends = [
+         attoparsec base base64-bytestring binary blaze-builder bytestring
+         case-insensitive containers entropy network random SHA text
+       ];
        testHaskellDepends = [
          attoparsec base base64-bytestring binary blaze-builder bytestring
          case-insensitive containers entropy HUnit network QuickCheck random
@@ -203080,9 +205722,9 @@ self: {
 
   "websockets-rpc" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
-     , exceptions, mtl, QuickCheck, quickcheck-instances, stm, tasty
-     , tasty-quickcheck, text, transformers, unordered-containers
-     , wai-transformers, websockets
+     , exceptions, MonadRandom, mtl, QuickCheck, quickcheck-instances
+     , stm, tasty, tasty-quickcheck, text, transformers
+     , unordered-containers, wai-transformers, websockets
      }:
      mkDerivation {
        pname = "websockets-rpc";
@@ -203095,6 +205737,10 @@ self: {
          stm text transformers unordered-containers wai-transformers
          websockets
        ];
+       executableHaskellDepends = [
+         aeson async base exceptions MonadRandom mtl wai-transformers
+         websockets
+       ];
        testHaskellDepends = [
          aeson base QuickCheck quickcheck-instances tasty tasty-quickcheck
        ];
@@ -203104,7 +205750,7 @@ self: {
 
   "websockets-rpc_0_6_0" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
-     , exceptions, hashable, monad-control, mtl, QuickCheck
+     , exceptions, hashable, monad-control, MonadRandom, mtl, QuickCheck
      , quickcheck-instances, stm, tasty, tasty-quickcheck, text
      , transformers, unordered-containers, uuid, wai-transformers
      , websockets, websockets-simple
@@ -203121,6 +205767,10 @@ self: {
          unordered-containers uuid wai-transformers websockets
          websockets-simple
        ];
+       executableHaskellDepends = [
+         aeson async base exceptions MonadRandom mtl wai-transformers
+         websockets websockets-simple
+       ];
        testHaskellDepends = [
          aeson base QuickCheck quickcheck-instances tasty tasty-quickcheck
        ];
@@ -203166,6 +205816,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "websockets-snap_0_10_2_3" = callPackage
+    ({ mkDerivation, base, bytestring, bytestring-builder, io-streams
+     , mtl, snap-core, snap-server, websockets
+     }:
+     mkDerivation {
+       pname = "websockets-snap";
+       version = "0.10.2.3";
+       sha256 = "0zdpim80yyw33k90r22jxac3g6h64jk2f831s3kw9z98l0m4gqlm";
+       libraryHaskellDepends = [
+         base bytestring bytestring-builder io-streams mtl snap-core
+         snap-server websockets
+       ];
+       description = "Snap integration for the websockets library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "webwire" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-builder, blaze-html
      , bytestring, case-insensitive, containers, cookie, cprng-aes
@@ -203240,8 +205907,9 @@ self: {
      }) {};
 
   "weigh" = callPackage
-    ({ mkDerivation, base, deepseq, mtl, process, split
-     , template-haskell, temporary
+    ({ mkDerivation, base, bytestring-trie, containers, deepseq, mtl
+     , process, random, split, template-haskell, temporary
+     , unordered-containers
      }:
      mkDerivation {
        pname = "weigh";
@@ -203250,7 +205918,9 @@ self: {
        libraryHaskellDepends = [
          base deepseq mtl process split template-haskell temporary
        ];
-       testHaskellDepends = [ base deepseq ];
+       testHaskellDepends = [
+         base bytestring-trie containers deepseq random unordered-containers
+       ];
        homepage = "https://github.com/fpco/weigh#readme";
        description = "Measure allocations of a Haskell functions/values";
        license = stdenv.lib.licenses.bsd3;
@@ -203565,6 +206235,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wikicfp-scraper_0_1_0_9" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, filepath, hspec
+     , scalpel-core, text, time
+     }:
+     mkDerivation {
+       pname = "wikicfp-scraper";
+       version = "0.1.0.9";
+       sha256 = "1qj28a53shcr4dq8i1fhyjbr4ybiyfb0kz3w0g439736mrnzsg4y";
+       libraryHaskellDepends = [
+         attoparsec base bytestring scalpel-core text time
+       ];
+       testHaskellDepends = [ base bytestring filepath hspec time ];
+       homepage = "https://github.com/debug-ito/wikicfp-scraper";
+       description = "Scrape WikiCFP web site";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wikipedia4epub" = callPackage
     ({ mkDerivation, base, bytestring, directory, epub, filepath
      , haskell98, HTTP, network, regex-base, regex-posix, tagsoup, url
@@ -203653,6 +206341,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wild-bind-x11_0_1_0_7" = callPackage
+    ({ mkDerivation, base, containers, fold-debounce, hspec, QuickCheck
+     , stm, text, time, transformers, wild-bind, X11
+     }:
+     mkDerivation {
+       pname = "wild-bind-x11";
+       version = "0.1.0.7";
+       sha256 = "0vdhmjkpy09w21xqhrqaxc645ghyb0ify1yq37wrlabqdqqms08d";
+       libraryHaskellDepends = [
+         base containers fold-debounce stm text transformers wild-bind X11
+       ];
+       testHaskellDepends = [ base hspec QuickCheck time wild-bind X11 ];
+       homepage = "https://github.com/debug-ito/wild-bind";
+       description = "X11-specific implementation for WildBind";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "win-hp-path" = callPackage
     ({ mkDerivation, base, process, split }:
      mkDerivation {
@@ -204132,8 +206838,8 @@ self: {
      }:
      mkDerivation {
        pname = "wolf";
-       version = "0.3.23";
-       sha256 = "0vj6195qqgx1ypv4h6jha3ayi73gcqxwwvcd7km12j4al68x6nvv";
+       version = "0.3.24";
+       sha256 = "13992gn3myjpdkmc4v2d1s2kmmsjzw8xzibs3iprlk72vacp70ja";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -204199,6 +206905,7 @@ self: {
        homepage = "https://github.com/jtdaugherty/word-wrap/";
        description = "A library for word-wrapping";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "word24" = callPackage
@@ -204449,13 +207156,18 @@ self: {
      }) {};
 
   "workflow-windows" = callPackage
-    ({ mkDerivation, base, doctest, hspec, QuickCheck }:
+    ({ mkDerivation, base, c-storable-deriving, doctest, free, hspec
+     , QuickCheck, StateVar, transformers, workflow-types
+     }:
      mkDerivation {
        pname = "workflow-windows";
        version = "0.0.0";
        sha256 = "14pzzm7c17sg76lmxjaw0d5avgpafgj4q66diqmh502mx8k2z4jc";
        isLibrary = true;
        isExecutable = true;
+       libraryHaskellDepends = [
+         base c-storable-deriving free StateVar transformers workflow-types
+       ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest hspec QuickCheck ];
        homepage = "http://github.com/sboosali/workflow-windows#readme";
@@ -204997,6 +207709,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wuss_1_1_5" = callPackage
+    ({ mkDerivation, base, bytestring, connection, network, websockets
+     }:
+     mkDerivation {
+       pname = "wuss";
+       version = "1.1.5";
+       sha256 = "0n7sixmvy084hggvagkd9nq06gxhisrklm1b8fahkjylahbzh2qd";
+       libraryHaskellDepends = [
+         base bytestring connection network websockets
+       ];
+       homepage = "https://github.com/tfausak/wuss#readme";
+       description = "Secure WebSocket (WSS) clients";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wx" = callPackage
     ({ mkDerivation, base, stm, time, wxcore }:
      mkDerivation {
@@ -205259,6 +207987,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "x509_1_7_1" = callPackage
+    ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base
+     , bytestring, containers, cryptonite, hourglass, memory, mtl, pem
+     , tasty, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "x509";
+       version = "1.7.1";
+       sha256 = "0rz4z1gna5pqhvicsvfgvf7lk2f924hqvkzjapq4727gq6q6crgr";
+       libraryHaskellDepends = [
+         asn1-encoding asn1-parse asn1-types base bytestring containers
+         cryptonite hourglass memory mtl pem
+       ];
+       testHaskellDepends = [
+         asn1-types base bytestring cryptonite hourglass mtl tasty
+         tasty-quickcheck
+       ];
+       homepage = "http://github.com/vincenthz/hs-certificate";
+       description = "X509 reader and writer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "x509-store" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring
      , containers, cryptonite, directory, filepath, mtl, pem, x509
@@ -205276,6 +208027,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "x509-store_1_6_3" = callPackage
+    ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring
+     , containers, cryptonite, directory, filepath, mtl, pem, x509
+     }:
+     mkDerivation {
+       pname = "x509-store";
+       version = "1.6.3";
+       sha256 = "09adqiwhl85f2kj77v08dgqzizs4cf0ks01q5q793c39wfacy2fp";
+       libraryHaskellDepends = [
+         asn1-encoding asn1-types base bytestring containers cryptonite
+         directory filepath mtl pem x509
+       ];
+       homepage = "http://github.com/vincenthz/hs-certificate";
+       description = "X.509 collection accessing and storing methods";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "x509-system" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , mtl, pem, process, x509, x509-store
@@ -205293,6 +208062,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "x509-system_1_6_5" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory, filepath
+     , mtl, pem, process, x509, x509-store
+     }:
+     mkDerivation {
+       pname = "x509-system";
+       version = "1.6.5";
+       sha256 = "0vrw8a63lh8d5nr4qc9ch97ng1r54n2ppnh7g1cnhrgnkbgkp1fa";
+       libraryHaskellDepends = [
+         base bytestring containers directory filepath mtl pem process x509
+         x509-store
+       ];
+       homepage = "http://github.com/vincenthz/hs-certificate";
+       description = "Handle per-operating-system X.509 accessors and storage";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "x509-util" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring
      , cryptonite, directory, hourglass, pem, x509, x509-store
@@ -205300,8 +208087,8 @@ self: {
      }:
      mkDerivation {
        pname = "x509-util";
-       version = "1.6.1";
-       sha256 = "1387r62y1dj5bx9xvlacbcigsk8zz6cb99q61zxpsfv3ij6khd6m";
+       version = "1.6.3";
+       sha256 = "1ca68z6jvsf7xx1qx44k2cic3ijv44ah738rx755gdxx056s49sz";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -205311,6 +208098,7 @@ self: {
        homepage = "http://github.com/vincenthz/hs-certificate";
        description = "Utility for X509 certificate and chain";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "x509-validation" = callPackage
@@ -205332,6 +208120,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "x509-validation_1_6_8" = callPackage
+    ({ mkDerivation, asn1-encoding, asn1-types, base, byteable
+     , bytestring, containers, cryptonite, data-default-class, hourglass
+     , memory, mtl, pem, tasty, tasty-hunit, x509, x509-store
+     }:
+     mkDerivation {
+       pname = "x509-validation";
+       version = "1.6.8";
+       sha256 = "19ym8lj5r36f1fiq4x1f2pwxv4jplb3pwzy6hgfzva5s1vvyhj3s";
+       libraryHaskellDepends = [
+         asn1-encoding asn1-types base byteable bytestring containers
+         cryptonite data-default-class hourglass memory mtl pem x509
+         x509-store
+       ];
+       testHaskellDepends = [
+         asn1-encoding asn1-types base bytestring cryptonite
+         data-default-class hourglass tasty tasty-hunit x509 x509-store
+       ];
+       homepage = "http://github.com/vincenthz/hs-certificate";
+       description = "X.509 Certificate and CRL validation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "x86-64bit" = callPackage
     ({ mkDerivation, base, deepseq, monads-tf, QuickCheck, tardis
      , vector
@@ -206944,6 +209756,7 @@ self: {
        libraryHaskellDepends = [
          base containers process transformers X11 xmonad xmonad-contrib
        ];
+       executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec xmonad ];
        homepage = "https://hub.darcs.net/vmchale/xmonad-vanessa";
        description = "Custom xmonad, which builds with stack or cabal";
@@ -207494,14 +210307,14 @@ self: {
      }:
      mkDerivation {
        pname = "yaml-combinators";
-       version = "1.0.1";
-       sha256 = "03y7z08ly3l5plh2c06i1p83c12s15fwshkl4nakqf1a6vb7bl48";
+       version = "1.1";
+       sha256 = "045zi5lipnjw161xz2awr5zwnzhiszsrrpwin64q4r5pxjkh7ala";
        libraryHaskellDepends = [
          aeson base bytestring generics-sop scientific text transformers
          unordered-containers vector yaml
        ];
        testHaskellDepends = [
-         aeson base doctest tasty tasty-hunit unordered-containers
+         aeson base doctest tasty tasty-hunit text unordered-containers
        ];
        homepage = "https://github.com/feuerbach/yaml-combinators";
        description = "YAML parsing combinators for improved validation and error reporting";
@@ -207677,7 +210490,7 @@ self: {
      }) {};
 
   "yampa-canvas" = callPackage
-    ({ mkDerivation, base, blank-canvas, stm, time, Yampa }:
+    ({ mkDerivation, base, blank-canvas, stm, text, time, Yampa }:
      mkDerivation {
        pname = "yampa-canvas";
        version = "0.2.2";
@@ -207687,6 +210500,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base blank-canvas stm time Yampa ];
+       executableHaskellDepends = [ base blank-canvas text Yampa ];
        description = "blank-canvas frontend for Yampa";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -207713,7 +210527,7 @@ self: {
 
   "yampa-glut" = callPackage
     ({ mkDerivation, base, GLUT, newtype, OpenGL, vector-space
-     , Yampa-core
+     , vector-space-opengl, Yampa-core
      }:
      mkDerivation {
        pname = "yampa-glut";
@@ -207724,9 +210538,14 @@ self: {
        libraryHaskellDepends = [
          base GLUT newtype OpenGL vector-space Yampa-core
        ];
+       executableHaskellDepends = [
+         base GLUT newtype OpenGL vector-space vector-space-opengl
+         Yampa-core
+       ];
        homepage = "https://github.com/ony/yampa-glut";
        description = "Connects Yampa and GLUT";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yampa2048" = callPackage
@@ -207746,8 +210565,8 @@ self: {
 
   "yandex-translate" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default-class
-     , exceptions, lens, lens-aeson, text, transformers
-     , unordered-containers, wreq
+     , exceptions, hspec, hspec-core, lens, lens-aeson, text
+     , transformers, unordered-containers, wreq
      }:
      mkDerivation {
        pname = "yandex-translate";
@@ -207757,6 +210576,9 @@ self: {
          aeson base bytestring data-default-class exceptions lens lens-aeson
          text transformers unordered-containers wreq
        ];
+       testHaskellDepends = [
+         base data-default-class hspec hspec-core lens text transformers
+       ];
        description = "Bindings to Yandex translate API";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -208258,8 +211080,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth-hmac-keccak";
-       version = "0.0.0.2";
-       sha256 = "005v6wr9xw6lm4w7nm9pbbyp5j458dcyshk8yh3vlpf7sj29cya6";
+       version = "0.0.0.3";
+       sha256 = "1x5qnhdhy0n6kf9gljkig2q4dsfay1rv8gg3xc5ly5dvbbmy4zp8";
        libraryHaskellDepends = [
          aeson base bytestring cryptonite mtl persistent random shakespeare
          text yesod-auth yesod-core yesod-form yesod-persistent yesod-static
@@ -208338,6 +211160,7 @@ self: {
        homepage = "http://github.com/mulderr/yesod-auth-ldap-native";
        description = "Yesod LDAP authentication plugin";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-nopassword" = callPackage
@@ -208376,10 +211199,10 @@ self: {
      }) {};
 
   "yesod-auth-oauth2" = callPackage
-    ({ mkDerivation, aeson, authenticate, base, bytestring, hoauth2
-     , hspec, http-client, http-conduit, http-types, lifted-base
-     , network-uri, random, text, transformers, vector, yesod-auth
-     , yesod-core, yesod-form
+    ({ mkDerivation, aeson, authenticate, base, bytestring, containers
+     , hoauth2, hspec, http-client, http-conduit, http-types
+     , lifted-base, load-env, network-uri, random, text, transformers
+     , vector, warp, yesod, yesod-auth, yesod-core, yesod-form
      }:
      mkDerivation {
        pname = "yesod-auth-oauth2";
@@ -208392,6 +211215,9 @@ self: {
          http-types lifted-base network-uri random text transformers vector
          yesod-auth yesod-core yesod-form
        ];
+       executableHaskellDepends = [
+         base containers http-conduit load-env text warp yesod yesod-auth
+       ];
        testHaskellDepends = [ base hspec ];
        homepage = "http://github.com/thoughtbot/yesod-auth-oauth2";
        description = "OAuth 2.0 authentication plugins";
@@ -208629,6 +211455,50 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-core_1_4_35_1" = callPackage
+    ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
+     , blaze-html, blaze-markup, byteable, bytestring, case-insensitive
+     , cereal, clientsession, conduit, conduit-extra, containers, cookie
+     , criterion, data-default, deepseq, deepseq-generics, directory
+     , exceptions, fast-logger, hspec, hspec-expectations, http-types
+     , HUnit, lifted-base, monad-control, monad-logger, mtl, mwc-random
+     , network, old-locale, parsec, path-pieces, primitive, QuickCheck
+     , random, resourcet, safe, semigroups, shakespeare
+     , streaming-commons, template-haskell, text, time, transformers
+     , transformers-base, unix-compat, unordered-containers, vector, wai
+     , wai-extra, wai-logger, warp, word8
+     }:
+     mkDerivation {
+       pname = "yesod-core";
+       version = "1.4.35.1";
+       sha256 = "0m91b4w3yixlsc9y07n0s8k4nzsqk8m8fz2gpxk1rhv6pp1k25cx";
+       libraryHaskellDepends = [
+         aeson auto-update base blaze-builder blaze-html blaze-markup
+         byteable bytestring case-insensitive cereal clientsession conduit
+         conduit-extra containers cookie data-default deepseq
+         deepseq-generics directory exceptions fast-logger http-types
+         lifted-base monad-control monad-logger mtl mwc-random old-locale
+         parsec path-pieces primitive random resourcet safe semigroups
+         shakespeare template-haskell text time transformers
+         transformers-base unix-compat unordered-containers vector wai
+         wai-extra wai-logger warp word8
+       ];
+       testHaskellDepends = [
+         async base blaze-builder bytestring clientsession conduit
+         conduit-extra containers cookie hspec hspec-expectations http-types
+         HUnit lifted-base mwc-random network path-pieces QuickCheck random
+         resourcet shakespeare streaming-commons template-haskell text
+         transformers wai wai-extra
+       ];
+       benchmarkHaskellDepends = [
+         base blaze-html bytestring criterion shakespeare text transformers
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Creation of type-safe, RESTful web applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-crud" = callPackage
     ({ mkDerivation, base, classy-prelude, containers, MissingH
      , monad-control, persistent, random, safe, stm, uuid, yesod-core
@@ -208890,6 +211760,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-form_1_4_13" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
+     , blaze-markup, byteable, bytestring, containers, data-default
+     , email-validate, hspec, network-uri, persistent, resourcet
+     , semigroups, shakespeare, template-haskell, text, time
+     , transformers, wai, xss-sanitize, yesod-core, yesod-persistent
+     }:
+     mkDerivation {
+       pname = "yesod-form";
+       version = "1.4.13";
+       sha256 = "0yq98rk81nilm39djpwl2kvr83j96yakc1ysyy3zgywb2k1ncvqk";
+       libraryHaskellDepends = [
+         aeson attoparsec base blaze-builder blaze-html blaze-markup
+         byteable bytestring containers data-default email-validate
+         network-uri persistent resourcet semigroups shakespeare
+         template-haskell text time transformers wai xss-sanitize yesod-core
+         yesod-persistent
+       ];
+       testHaskellDepends = [ base hspec text time ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Form handling support for Yesod Web Framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-form-bootstrap4" = callPackage
     ({ mkDerivation, base, classy-prelude-yesod, yesod-form }:
      mkDerivation {
@@ -209005,9 +211900,11 @@ self: {
      }) {};
 
   "yesod-job-queue" = callPackage
-    ({ mkDerivation, aeson, api-field-json-th, base, bytestring, cron
-     , file-embed, hedis, lens, monad-control, monad-logger, stm, text
-     , time, transformers, uuid, yesod, yesod-core, yesod-persistent
+    ({ mkDerivation, aeson, api-field-json-th, base, bytestring
+     , classy-prelude-yesod, cron, file-embed, hedis, lens
+     , monad-control, monad-logger, persistent-sqlite, resourcet, stm
+     , text, time, transformers, uuid, yesod, yesod-core
+     , yesod-persistent
      }:
      mkDerivation {
        pname = "yesod-job-queue";
@@ -209020,6 +211917,10 @@ self: {
          monad-control monad-logger stm text time transformers uuid yesod
          yesod-core yesod-persistent
        ];
+       executableHaskellDepends = [
+         base classy-prelude-yesod hedis monad-logger persistent-sqlite
+         resourcet yesod yesod-core
+       ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/nakaji-dayo/yesod-job-queue#readme";
        description = "Background jobs library for Yesod";
@@ -209064,9 +211965,14 @@ self: {
      }) {};
 
   "yesod-mangopay" = callPackage
-    ({ mkDerivation, base, containers, http-conduit, http-types
-     , lifted-base, mangopay, persistent-template, text, time, yesod
-     , yesod-core
+    ({ mkDerivation, aeson, base, bytestring, conduit, conduit-extra
+     , containers, country-codes, data-default, directory, fast-logger
+     , hamlet, hjsmin, http-conduit, http-types, lifted-base, mangopay
+     , monad-control, monad-logger, persistent, persistent-postgresql
+     , persistent-template, resourcet, shakespeare, template-haskell
+     , text, time, wai, wai-extra, wai-logger, warp, yaml, yesod
+     , yesod-auth, yesod-core, yesod-form, yesod-persistent
+     , yesod-static
      }:
      mkDerivation {
        pname = "yesod-mangopay";
@@ -209078,6 +211984,15 @@ self: {
          base containers http-conduit http-types lifted-base mangopay
          persistent-template text time yesod yesod-core
        ];
+       executableHaskellDepends = [
+         aeson base bytestring conduit conduit-extra containers
+         country-codes data-default directory fast-logger hamlet hjsmin
+         http-conduit lifted-base mangopay monad-control monad-logger
+         persistent persistent-postgresql persistent-template resourcet
+         shakespeare template-haskell text time wai wai-extra wai-logger
+         warp yaml yesod yesod-auth yesod-core yesod-form yesod-persistent
+         yesod-static
+       ];
        homepage = "https://github.com/prowdsponsor/mangopay";
        description = "Yesod library for MangoPay API access";
        license = stdenv.lib.licenses.bsd3;
@@ -209172,7 +212087,8 @@ self: {
 
   "yesod-paginator" = callPackage
     ({ mkDerivation, base, data-default, hspec, persistent, resourcet
-     , text, transformers, wai-extra, yesod, yesod-core, yesod-test
+     , text, transformers, wai-extra, warp, yesod, yesod-core
+     , yesod-test
      }:
      mkDerivation {
        pname = "yesod-paginator";
@@ -209183,6 +212099,7 @@ self: {
        libraryHaskellDepends = [
          base persistent resourcet text transformers yesod
        ];
+       executableHaskellDepends = [ base warp yesod ];
        testHaskellDepends = [
          base data-default hspec wai-extra yesod-core yesod-test
        ];
@@ -209662,11 +212579,48 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-static_1_5_3_1" = callPackage
+    ({ mkDerivation, async, attoparsec, base, base64-bytestring
+     , blaze-builder, byteable, bytestring, conduit, conduit-extra
+     , containers, cryptonite, cryptonite-conduit, css-text
+     , data-default, directory, exceptions, file-embed, filepath
+     , hashable, hjsmin, hspec, http-types, HUnit, memory, mime-types
+     , old-time, process, resourcet, template-haskell, text
+     , transformers, unix-compat, unordered-containers, wai
+     , wai-app-static, wai-extra, yesod-core, yesod-test
+     }:
+     mkDerivation {
+       pname = "yesod-static";
+       version = "1.5.3.1";
+       sha256 = "0drrzg59k0jmbxdf2d7mlk0nr0nvdd8h164638nizjy8713ghjsl";
+       libraryHaskellDepends = [
+         async attoparsec base base64-bytestring blaze-builder byteable
+         bytestring conduit conduit-extra containers cryptonite
+         cryptonite-conduit css-text data-default directory exceptions
+         file-embed filepath hashable hjsmin http-types memory mime-types
+         old-time process resourcet template-haskell text transformers
+         unix-compat unordered-containers wai wai-app-static yesod-core
+       ];
+       testHaskellDepends = [
+         async base base64-bytestring byteable bytestring conduit
+         conduit-extra containers cryptonite cryptonite-conduit data-default
+         directory exceptions file-embed filepath hjsmin hspec http-types
+         HUnit memory mime-types old-time process resourcet template-haskell
+         text transformers unix-compat unordered-containers wai
+         wai-app-static wai-extra yesod-core yesod-test
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Static file serving subsite for Yesod Web Framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-static-angular" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, blaze-markup
      , bytestring, data-default, directory, filepath, hamlet, hspec
      , HUnit, language-javascript, mime-types, shakespeare
-     , template-haskell, text, yesod-core, yesod-static, yesod-test
+     , template-haskell, text, yesod, yesod-core, yesod-static
+     , yesod-test
      }:
      mkDerivation {
        pname = "yesod-static-angular";
@@ -209679,6 +212633,9 @@ self: {
          directory filepath hamlet language-javascript mime-types
          shakespeare template-haskell text yesod-core yesod-static
        ];
+       executableHaskellDepends = [
+         base data-default shakespeare yesod yesod-static
+       ];
        testHaskellDepends = [
          base bytestring hamlet hspec HUnit shakespeare template-haskell
          text yesod-core yesod-static yesod-test
@@ -209743,6 +212700,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-test_1_5_8" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
+     , blaze-markup, bytestring, case-insensitive, containers, cookie
+     , hspec, hspec-core, html-conduit, http-types, HUnit, lifted-base
+     , monad-control, network, persistent, pretty-show, text, time
+     , transformers, wai, wai-extra, xml-conduit, xml-types, yesod-core
+     , yesod-form
+     }:
+     mkDerivation {
+       pname = "yesod-test";
+       version = "1.5.8";
+       sha256 = "0rvbvr8pa60b9rvhnsd1wcbs0x49s2rhqc76nqzv2i0qry5aym7h";
+       libraryHaskellDepends = [
+         attoparsec base blaze-builder blaze-html blaze-markup bytestring
+         case-insensitive containers cookie hspec-core html-conduit
+         http-types HUnit monad-control network persistent pretty-show text
+         time transformers wai wai-extra xml-conduit xml-types yesod-core
+       ];
+       testHaskellDepends = [
+         base bytestring containers hspec html-conduit http-types HUnit
+         lifted-base text wai xml-conduit yesod-core yesod-form
+       ];
+       homepage = "http://www.yesodweb.com";
+       description = "integration testing for WAI/Yesod Applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-test-json" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, hspec
      , http-types, HUnit, text, transformers, wai, wai-test
@@ -210841,6 +213826,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bindings-DSL ieee754 ];
+       executableHaskellDepends = [ base ];
        description = "Bindings to Facebook's Yoga layout library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -211538,6 +214524,7 @@ self: {
          array base binary bytestring containers digest directory filepath
          mtl old-time pretty text time unix zlib
        ];
+       executableHaskellDepends = [ base bytestring directory ];
        testHaskellDepends = [
          base bytestring directory HUnit old-time process temporary time
          unix
@@ -211717,19 +214704,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "zlib_0_5_4_2" = callPackage
-    ({ mkDerivation, base, bytestring, zlib }:
-     mkDerivation {
-       pname = "zlib";
-       version = "0.5.4.2";
-       sha256 = "15hhsk7z3gvm7sz2ic2z1ca5c6rpsln2rr391mdbm1bxlzc1gmkm";
-       libraryHaskellDepends = [ base bytestring ];
-       librarySystemDepends = [ zlib ];
-       description = "Compression and decompression in the gzip and zlib formats";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) zlib;};
-
   "zlib" = callPackage
     ({ mkDerivation, base, bytestring, QuickCheck, tasty, tasty-hunit
      , tasty-quickcheck, zlib
diff --git a/pkgs/development/interpreters/elixir/1.5.nix b/pkgs/development/interpreters/elixir/1.5.nix
index 0c3c0304a9b..23c4db804d3 100644
--- a/pkgs/development/interpreters/elixir/1.5.nix
+++ b/pkgs/development/interpreters/elixir/1.5.nix
@@ -1,7 +1,7 @@
 { mkDerivation }:
 
 mkDerivation rec {
-  version = "1.5.0-rc.2";
-  sha256 = "0wfxsfz1qbb6iapg8j1qskva6j4mccxqvv79xbz08fzzb6n1wvxa";
+  version = "1.5.0";
+  sha256 = "1y8c0s0wfgv444vhpnz9v8z8rc39kqhzzzkzqjxsh576vd868pbz";
   minimumOTPVersion = "18";
 }
diff --git a/pkgs/development/libraries/accelio/default.nix b/pkgs/development/libraries/accelio/default.nix
deleted file mode 100644
index a1f229ca5fb..00000000000
--- a/pkgs/development/libraries/accelio/default.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, libibverbs, librdmacm, libevent
-
-# Linux only deps
-, numactl, kernel ? null
-}:
-
-stdenv.mkDerivation rec {
-  name = "accelio-${version}${stdenv.lib.optionalString (kernel != null) "-kernel"}";
-  version = "1.5";
-
-  src = fetchFromGitHub {
-    owner = "accelio";
-    repo = "accelio";
-    rev = "v1.5";
-    sha256 = "172frqk2n43g0arhazgcwfvj0syf861vdzdpxl7idr142bb0ykf7";
-  };
-
-  hardeningDisable = [ "format" "pic" ];
-
-  patches = [ ./fix-printfs.patch ];
-
-  postPatch = ''
-    # Don't build broken examples
-    sed -i '/AC_CONFIG_SUBDIRS(\[\(examples\|tests\).*\/kernel/d' configure.ac
-
-    # Allow the installation of xio kernel headers
-    sed -i 's,/opt/xio,''${out},g' src/kernel/xio/Makefile.in
-
-    # Don't install ldconfig entries
-    sed -i '\,/etc/ld.so.conf.d/libxio.conf,d' src/usr/Makefile.am
-    sed -i '\,/sbin/ldconfig,d' src/usr/Makefile.am
-  '';
-
-  nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ libevent ];
-  propagatedBuildInputs = [ libibverbs librdmacm ]
-    ++ stdenv.lib.optional stdenv.isLinux numactl;
-
-  configureFlags = [
-    "--enable-rdma"
-    "--disable-raio-build"
-  ] ++ stdenv.lib.optionals (kernel != null) [
-    "--enable-kernel-module"
-    "--with-kernel=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
-    "--with-kernel-build=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
-  ];
-
-  INSTALL_MOD_PATH = "\${out}";
-
-  meta = with stdenv.lib; {
-    homepage = http://www.accelio.org/;
-    description = "High-performance messaging and RPC library";
-    longDescription = ''
-      A high-performance asynchronous reliable messaging and RPC library
-      optimized for hardware acceleration.
-    '';
-    license = licenses.bsd3;
-    platforms = with platforms; linux ++ freebsd;
-    maintainers = with maintainers; [ wkennington ];
-    # kernel 4.2 is the most recent supported kernel
-    broken = kernel != null &&
-      (builtins.compareVersions kernel.version "4.2" == 1);
-  };
-}
diff --git a/pkgs/development/libraries/accelio/fix-printfs.patch b/pkgs/development/libraries/accelio/fix-printfs.patch
deleted file mode 100644
index 23b2f40e42f..00000000000
--- a/pkgs/development/libraries/accelio/fix-printfs.patch
+++ /dev/null
@@ -1,615 +0,0 @@
-diff -rup accelio/benchmarks/usr/xio_perftest/xio_perftest_client.c accelio.new/benchmarks/usr/xio_perftest/xio_perftest_client.c
---- accelio/benchmarks/usr/xio_perftest/xio_perftest_client.c	2015-09-03 19:36:25.610337514 -0400
-+++ accelio.new/benchmarks/usr/xio_perftest/xio_perftest_client.c	2015-09-03 19:59:13.258697472 -0400
-@@ -246,7 +246,7 @@ static void *worker_thread(void *data)
- 		} else {
- 			vmsg_sglist_set_nents(&msg->out, 0);
- 		}
--		msg->user_context = (void *)get_cycles();
-+		msg->user_context = (void *)(intptr_t)get_cycles();
- 		/* send first message */
- 		if (xio_send_request(tdata->conn, msg) == -1) {
- 			if (xio_errno() != EAGAIN)
-@@ -330,7 +330,7 @@ static int on_response(struct xio_sessio
- {
- 	struct thread_data  *tdata = (struct thread_data *)cb_user_context;
- 
--	cycles_t rtt = (get_cycles()-(cycles_t)msg->user_context);
-+	cycles_t rtt = (get_cycles()-(cycles_t)(intptr_t)msg->user_context);
- 
- 	if (tdata->do_stat) {
- 		if (rtt > tdata->stat.max_rtt)
-@@ -358,7 +358,7 @@ static int on_response(struct xio_sessio
- 	msg->in.header.iov_len = 0;
- 	vmsg_sglist_set_nents(&msg->in, 0);
- 
--	msg->user_context = (void *)get_cycles();
-+	msg->user_context = (void *)(intptr_t)get_cycles();
- 	if (xio_send_request(tdata->conn, msg) == -1) {
- 		if (xio_errno() != EAGAIN)
- 			printf("**** [%p] Error - xio_send_request " \
-@@ -559,7 +559,7 @@ int run_client_test(struct perf_paramete
- 		       sess_data.min_lat_us,
- 		       sess_data.max_lat_us);
- 		if (fd)
--			fprintf(fd, "%lu, %d, %lu, %.2lf, %.2lf\n",
-+			fprintf(fd, "%" PRIu64 ", %d, %" PRIu64 ", %.2lf, %.2lf\n",
- 				data_len,
- 				threads_iter,
- 				sess_data.tps,
-diff -rup accelio/benchmarks/usr/xio_perftest/xio_perftest_parameters.h accelio.new/benchmarks/usr/xio_perftest/xio_perftest_parameters.h
---- accelio/benchmarks/usr/xio_perftest/xio_perftest_parameters.h	2015-09-03 19:36:25.610337514 -0400
-+++ accelio.new/benchmarks/usr/xio_perftest/xio_perftest_parameters.h	2015-09-03 19:57:30.856215123 -0400
-@@ -90,7 +90,7 @@ typedef enum { READ, WRITE} Verb;
- /* The format of the results */
- #define RESULT_FMT		" #bytes     #threads   #TPS       BW average[MBps]   Latency average[usecs]   Latency low[usecs]   Latency peak[usecs]\n"
- /* Result print format */
--#define REPORT_FMT		" %-7lu     %-2d         %-9.2lu	  %-9.2lf     %-9.2lf                  %-9.2lf              %-9.2lf\n"
-+#define REPORT_FMT		" %-7" PRIu64 "     %-2d         %-9.2" PRIu64 "	  %-9.2lf     %-9.2lf                  %-9.2lf              %-9.2lf\n"
- 
- 
- struct perf_parameters {
-diff -rup accelio/examples/usr/hello_world_iov/xio_client.c accelio.new/examples/usr/hello_world_iov/xio_client.c
---- accelio/examples/usr/hello_world_iov/xio_client.c	2015-09-03 19:36:25.611337519 -0400
-+++ accelio.new/examples/usr/hello_world_iov/xio_client.c	2015-09-03 19:42:19.983984370 -0400
-@@ -224,7 +224,7 @@ static void process_response(struct sess
- 				len = 64;
- 			tmp = str[len];
- 			str[len] = '\0';
--			printf("message header : [%lu] - %s\n",
-+			printf("message header : [%" PRIu64 "] - %s\n",
- 			       (rsp->request->sn + 1), str);
- 			str[len] = tmp;
- 		}
-@@ -236,7 +236,7 @@ static void process_response(struct sess
- 					len = 64;
- 				tmp = str[len];
- 				str[len] = '\0';
--				printf("message data: [%lu][%d][%zd] - %s\n",
-+				printf("message data: [%" PRIu64 "][%d][%zd] - %s\n",
- 				       (rsp->request->sn + 1), i, sglist[i].iov_len, str);
- 				str[len] = tmp;
- 			}
-diff -rup accelio/examples/usr/hello_world_iov/xio_server.c accelio.new/examples/usr/hello_world_iov/xio_server.c
---- accelio/examples/usr/hello_world_iov/xio_server.c	2015-09-03 19:36:25.611337519 -0400
-+++ accelio.new/examples/usr/hello_world_iov/xio_server.c	2015-09-03 19:43:07.353204184 -0400
-@@ -203,7 +203,7 @@ static void process_request(struct serve
- 				len = 64;
- 			tmp = str[len];
- 			str[len] = '\0';
--			printf("message header : [%lu] - %s\n",
-+			printf("message header : [%" PRIu64 "] - %s\n",
- 			       (req->sn + 1), str);
- 			str[len] = tmp;
- 		}
-@@ -215,7 +215,7 @@ static void process_request(struct serve
- 					len = 64;
- 				tmp = str[len];
- 				str[len] = '\0';
--				printf("message data: [%lu][%d][%zd] - %s\n",
-+				printf("message data: [%" PRIu64 "][%d][%zd] - %s\n",
- 				       (req->sn + 1), i, sglist[i].iov_len, str);
- 				str[len] = tmp;
- 			}
-@@ -360,11 +360,11 @@ static int on_msg_error(struct xio_sessi
- 	struct server_data *sdata = (struct server_data *)cb_user_context;
- 
- 	if (direction == XIO_MSG_DIRECTION_OUT) {
--		printf("**** [%p] message %lu failed. reason: %s\n",
-+		printf("**** [%p] message %" PRIu64 " failed. reason: %s\n",
- 		       session, msg->sn, xio_strerror(error));
- 	} else {
- 		xio_release_response(msg);
--		printf("**** [%p] message %lu failed. reason: %s\n",
-+		printf("**** [%p] message %" PRIu64 " failed. reason: %s\n",
- 		       session, msg->request->sn, xio_strerror(error));
- 	}
- 
-diff -rup accelio/examples/usr/hello_world_libevent/xio_client.c accelio.new/examples/usr/hello_world_libevent/xio_client.c
---- accelio/examples/usr/hello_world_libevent/xio_client.c	2015-09-03 19:36:25.612337524 -0400
-+++ accelio.new/examples/usr/hello_world_libevent/xio_client.c	2015-09-03 19:43:32.748322028 -0400
-@@ -87,7 +87,7 @@ static void process_response(struct sess
- {
- 	if (++session_data->cnt == PRINT_COUNTER) {
- 		((char *)(rsp->in.header.iov_base))[rsp->in.header.iov_len] = 0;
--		printf("message: [%lu] - %s\n",
-+		printf("message: [%" PRIu64 "] - %s\n",
- 		       (rsp->request->sn + 1), (char *)rsp->in.header.iov_base);
- 		session_data->cnt = 0;
- 	}
-diff -rup accelio/examples/usr/hello_world_libevent/xio_server.c accelio.new/examples/usr/hello_world_libevent/xio_server.c
---- accelio/examples/usr/hello_world_libevent/xio_server.c	2015-09-03 19:36:25.612337524 -0400
-+++ accelio.new/examples/usr/hello_world_libevent/xio_server.c	2015-09-03 19:43:50.556404665 -0400
-@@ -82,7 +82,7 @@ static void process_request(struct serve
- 				len = 64;
- 			tmp = str[len];
- 			str[len] = '\0';
--			printf("message header : [%lu] - %s\n",
-+			printf("message header : [%" PRIu64 "] - %s\n",
- 			       (req->sn + 1), str);
- 			str[len] = tmp;
- 		}
-@@ -94,7 +94,7 @@ static void process_request(struct serve
- 					len = 64;
- 				tmp = str[len];
- 				str[len] = '\0';
--				printf("message data: [%lu][%d][%d] - %s\n",
-+				printf("message data: [%" PRIu64 "][%d][%d] - %s\n",
- 				       (req->sn + 1), i, len, str);
- 				str[len] = tmp;
- 			}
-diff -rup accelio/examples/usr/hello_world_mt/xio_mt_client.c accelio.new/examples/usr/hello_world_mt/xio_mt_client.c
---- accelio/examples/usr/hello_world_mt/xio_mt_client.c	2015-09-03 19:36:25.611337519 -0400
-+++ accelio.new/examples/usr/hello_world_mt/xio_mt_client.c	2015-09-03 19:41:13.493675827 -0400
-@@ -40,6 +40,7 @@
- #include <string.h>
- #include <inttypes.h>
- #include <sched.h>
-+#include <inttypes.h>
- 
- #include "libxio.h"
- 
-@@ -133,7 +134,7 @@ static void process_response(struct thre
- {
- 	if (++tdata->cnt == PRINT_COUNTER) {
- 		((char *)(rsp->in.header.iov_base))[rsp->in.header.iov_len] = 0;
--		printf("thread [%d] - tid:%p  - message: [%lu] - %s\n",
-+		printf("thread [%d] - tid:%p  - message: [%" PRIu64 "] - %s\n",
- 		       tdata->affinity,
- 		      (void *)pthread_self(),
- 		       (rsp->request->sn + 1), (char *)rsp->in.header.iov_base);
-diff -rup accelio/examples/usr/hello_world_mt/xio_mt_server.c accelio.new/examples/usr/hello_world_mt/xio_mt_server.c
---- accelio/examples/usr/hello_world_mt/xio_mt_server.c	2015-09-03 19:36:25.611337519 -0400
-+++ accelio.new/examples/usr/hello_world_mt/xio_mt_server.c	2015-09-03 19:41:31.730760455 -0400
-@@ -104,7 +104,7 @@ static void process_request(struct threa
- 			    struct xio_msg *req)
- {
- 	if (++tdata->cnt == PRINT_COUNTER) {
--		printf("thread [%d] tid:%p - message: [%lu] - %s\n",
-+		printf("thread [%d] tid:%p - message: [%" PRIu64 "] - %s\n",
- 		       tdata->affinity,
- 		       (void *)pthread_self(),
- 		       (req->sn + 1), (char *)req->in.header.iov_base);
-diff -rup accelio/regression/usr/reg_basic_mt/reg_basic_mt_client.c accelio.new/regression/usr/reg_basic_mt/reg_basic_mt_client.c
---- accelio/regression/usr/reg_basic_mt/reg_basic_mt_client.c	2015-09-03 19:36:25.603337482 -0400
-+++ accelio.new/regression/usr/reg_basic_mt/reg_basic_mt_client.c	2015-09-03 20:00:15.169989095 -0400
-@@ -416,11 +416,11 @@ static int on_msg_error(struct xio_sessi
- 	struct thread_data	*tdata		= conn_entry->tdata;
- 
- 	if (direction == XIO_MSG_DIRECTION_OUT) {
--		DEBUG("**** [%p] message %lu failed. reason: %s\n",
-+		DEBUG("**** [%p] message %" PRIu64 " failed. reason: %s\n",
- 		       session, req->sn, xio_strerror(error));
- 	} else {
- 		xio_release_response(req);
--		DEBUG("**** [%p] message %lu failed. reason: %s\n",
-+		DEBUG("**** [%p] message %" PRIu64 " failed. reason: %s\n",
- 		       session, req->request->sn, xio_strerror(error));
- 	}
- 	obj_pool_put(tdata->req_pool, req);
-diff -rup accelio/src/tools/usr/xio_if_numa_cpus.c accelio.new/src/tools/usr/xio_if_numa_cpus.c
---- accelio/src/tools/usr/xio_if_numa_cpus.c	2015-09-03 19:36:25.603337482 -0400
-+++ accelio.new/src/tools/usr/xio_if_numa_cpus.c	2015-09-03 19:40:06.398364476 -0400
-@@ -43,6 +43,7 @@
- #include <net/if.h>
- #include <stdio.h>
- #include <numa.h>
-+#include <inttypes.h>
- 
- #define cpusmask_test_bit(nr, addr)	(*(addr) & (1ULL << (nr)))
- #define cpusmask_set_bit(nr, addr)	(*(addr) |=  (1ULL << (nr)))
-@@ -244,7 +245,7 @@ int main(int argc, char *argv[])
- 		}
- 		intf_cpusmask_str(cpusmask, cpusnum, cpus_str);
- 
--		printf("%-10s %-16s %-30s %-5d 0x%-8lx %-4s[%d] - %s\n",
-+		printf("%-10s %-16s %-30s %-5d 0x%-8" PRIx64 " %-4s[%d] - %s\n",
- 		       ifa->ifa_name, host, flags, numa_node, cpusmask,
- 		       "cpus",  cpusnum, cpus_str);
- 	}
-diff -rup accelio/src/tools/usr/xio_mem_usage.c accelio.new/src/tools/usr/xio_mem_usage.c
---- accelio/src/tools/usr/xio_mem_usage.c	2015-09-03 19:36:25.603337482 -0400
-+++ accelio.new/src/tools/usr/xio_mem_usage.c	2015-09-03 19:38:57.596044838 -0400
-@@ -73,7 +73,7 @@
- 	while (i++ < 48) { \
- 		printf("."); \
- 	} \
--	printf(" %6lu\n", sizeof(type)); \
-+	printf(" %zu\n", sizeof(type)); \
- }
- 
- int main(int argc, char **argv)
-diff -rup accelio/tests/portable/direct_rdma_test/xio_rdma_common.c accelio.new/tests/portable/direct_rdma_test/xio_rdma_common.c
---- accelio/tests/portable/direct_rdma_test/xio_rdma_common.c	2015-09-03 19:36:25.610337514 -0400
-+++ accelio.new/tests/portable/direct_rdma_test/xio_rdma_common.c	2015-09-03 19:56:25.521908028 -0400
-@@ -90,7 +90,7 @@ static int publish_our_buffer(struct xio
- 	 * this flag must be on */
- 	rsp->flags = XIO_MSG_FLAG_IMM_SEND_COMP;
- 
--	rdma_test_buf.addr = (uint64_t)rdma_reg_mem.addr;
-+	rdma_test_buf.addr = (intptr_t)rdma_reg_mem.addr;
- 	rdma_test_buf.length = rdma_reg_mem.length;
- 	rdma_test_buf.rkey = xio_lookup_rkey_by_response(&rdma_reg_mem, rsp);
- 
-diff -rup accelio/tests/usr/hello_test/xio_client.c accelio.new/tests/usr/hello_test/xio_client.c
---- accelio/tests/usr/hello_test/xio_client.c	2015-09-03 19:36:25.608337505 -0400
-+++ accelio.new/tests/usr/hello_test/xio_client.c	2015-09-03 19:45:43.055926711 -0400
-@@ -181,13 +181,13 @@ static void process_response(struct test
- 
- 		double txbw = (1.0*pps*test_params->stat.txlen/ONE_MB);
- 		double rxbw = (1.0*pps*test_params->stat.rxlen/ONE_MB);
--		printf("transactions per second: %lu, bandwidth: " \
-+		printf("transactions per second: %" PRIu64 ", bandwidth: " \
- 		       "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, RX: %zd B\n",
- 		       pps, txbw, rxbw,
- 		       test_params->stat.txlen, test_params->stat.rxlen);
- 		get_time(timeb, 40);
- 
--		printf("**** [%s] - message [%zd] %s - %s\n",
-+		printf("**** [%s] - message [%" PRIu64 "] %s - %s\n",
- 		       timeb, (rsp->request->sn + 1),
- 		       (char *)rsp->in.header.iov_base,
- 		       (char *)(inents > 0 ? isglist[0].iov_base : NULL));
-@@ -212,8 +212,8 @@ static int on_session_event(struct xio_s
- 
- 	switch (event_data->event) {
- 	case XIO_SESSION_CONNECTION_TEARDOWN_EVENT:
--		printf("nsent:%lu, nrecv:%lu, " \
--		       "delta:%lu\n",
-+		printf("nsent:%" PRIu64 ", nrecv:%" PRIu64 ", " \
-+		       "delta:%" PRIu64 "\n",
- 		       test_params->nsent, test_params->nrecv,
- 		       test_params->nsent-test_params->nrecv);
- 
-@@ -370,11 +370,11 @@ static int on_msg_error(struct xio_sessi
- 	struct test_params *test_params = (struct test_params *)cb_user_context;
- 
- 	if (direction == XIO_MSG_DIRECTION_OUT) {
--		printf("**** [%p] message %lu failed. reason: %s\n",
-+		printf("**** [%p] message %" PRIu64 " failed. reason: %s\n",
- 		       session, msg->sn, xio_strerror(error));
- 	} else {
- 		xio_release_response(msg);
--		printf("**** [%p] message %lu failed. reason: %s\n",
-+		printf("**** [%p] message %" PRIu64 " failed. reason: %s\n",
- 		       session, msg->request->sn, xio_strerror(error));
- 	}
- 
-diff -rup accelio/tests/usr/hello_test/xio_server.c accelio.new/tests/usr/hello_test/xio_server.c
---- accelio/tests/usr/hello_test/xio_server.c	2015-09-03 19:36:25.608337505 -0400
-+++ accelio.new/tests/usr/hello_test/xio_server.c	2015-09-03 19:46:35.777171360 -0400
-@@ -112,7 +112,7 @@ static void process_request(struct xio_m
- 	if (++cnt == PRINT_COUNTER) {
- 		struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in);
- 
--		printf("**** message [%lu] %s - %s\n",
-+		printf("**** message [%" PRIu64 "] %s - %s\n",
- 		       (msg->sn+1),
- 		       (char *)msg->in.header.iov_base,
- 		       (char *)sglist[0].iov_base);
-@@ -146,8 +146,8 @@ static int on_session_event(struct xio_s
- 		break;
- 	case XIO_SESSION_CONNECTION_TEARDOWN_EVENT:
- 		if (event_data->reason != XIO_E_SESSION_REJECTED) {
--			printf("last sent:%lu, last comp:%lu, " \
--			       "delta:%lu\n",
-+			printf("last sent:%" PRIu64 ", last comp:%" PRIu64 ", " \
-+			       "delta:%" PRIu64 "\n",
- 			       test_params->nsent,  test_params->ncomp,
- 			       test_params->nsent-test_params->ncomp);
- 			test_params->connection = NULL;
-@@ -257,7 +257,7 @@ static int on_msg_error(struct xio_sessi
- {
- 	struct test_params *test_params = (struct test_params *)cb_user_context;
- 
--	printf("**** [%p] message [%lu] failed. reason: %s\n",
-+	printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
- 	       session, msg->request->sn, xio_strerror(error));
- 
- 	msg_pool_put(test_params->pool, msg);
-diff -rup accelio/tests/usr/hello_test_bidi/xio_bidi_client.c accelio.new/tests/usr/hello_test_bidi/xio_bidi_client.c
---- accelio/tests/usr/hello_test_bidi/xio_bidi_client.c	2015-09-03 19:36:25.608337505 -0400
-+++ accelio.new/tests/usr/hello_test_bidi/xio_bidi_client.c	2015-09-03 19:49:10.164887785 -0400
-@@ -114,7 +114,7 @@ static void process_request(struct xio_m
- 	if (++cnt == print_counter) {
- 		struct xio_iovec_ex *sglist = vmsg_sglist(&req->in);
- 
--		printf("**** request [%lu] %s - %s\n",
-+		printf("**** request [%" PRIu64 "] %s - %s\n",
- 		       (req->sn+1),
- 		       (char *)req->in.header.iov_base,
- 		       (char *)sglist[0].iov_base);
-@@ -171,11 +171,11 @@ static void process_response(struct xio_
- 		double txbw = (1.0*pps*txlen/ONE_MB);
- 		double rxbw = (1.0*pps*rxlen/ONE_MB);
- 
--		printf("transactions per second: %lu, bandwidth: " \
-+		printf("transactions per second: %" PRIu64 ", bandwidth: " \
- 		       "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, RX: %zd B\n",
- 		       pps, txbw, rxbw, txlen, rxlen);
- 		get_time(timeb, 40);
--		printf("**** [%s] - response [%lu] %s - %s\n",
-+		printf("**** [%s] - response [%" PRIu64 "] %s - %s\n",
- 		       timeb, (rsp->request->sn + 1),
- 		       (char *)rsp->in.header.iov_base,
- 		       (char *)(inents > 0 ? isglist[0].iov_base : NULL));
-@@ -357,7 +357,7 @@ static int on_msg_error(struct xio_sessi
- {
- 	switch (msg->type) {
- 	case XIO_MSG_TYPE_REQ:
--		printf("**** [%p] message [%lu] failed. reason: %s\n",
-+		printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
- 		       session, msg->sn, xio_strerror(error));
- 		msg_pool_put(pool, msg);
- 		switch (error) {
-@@ -369,7 +369,7 @@ static int on_msg_error(struct xio_sessi
- 		};
- 		break;
- 	case XIO_MSG_TYPE_RSP:
--		printf("**** [%p] message [%lu] failed. reason: %s\n",
-+		printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
- 		       session, msg->request->sn, xio_strerror(error));
- 		/* message is no longer needed */
- 		switch (error) {
-diff -rup accelio/tests/usr/hello_test_bidi/xio_bidi_server.c accelio.new/tests/usr/hello_test_bidi/xio_bidi_server.c
---- accelio/tests/usr/hello_test_bidi/xio_bidi_server.c	2015-09-03 19:36:25.608337505 -0400
-+++ accelio.new/tests/usr/hello_test_bidi/xio_bidi_server.c	2015-09-03 19:49:52.860085909 -0400
-@@ -143,11 +143,11 @@ static void process_response(struct xio_
- 		double txbw = (1.0*pps*txlen/ONE_MB);
- 		double rxbw = (1.0*pps*rxlen/ONE_MB);
- 
--		printf("transactions per second: %lu, bandwidth: " \
-+		printf("transactions per second: %" PRIu64 ", bandwidth: " \
- 		       "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, RX: %zd B\n",
- 		       pps, txbw, rxbw, txlen, rxlen);
- 		get_time(timeb, 40);
--		printf("**** [%s] - response complete [%lu] %s - %s\n",
-+		printf("**** [%s] - response complete [%" PRIu64 "] %s - %s\n",
- 		       timeb, (rsp->request->sn + 1),
- 		       (char *)rsp->in.header.iov_base,
- 		       (char *)(inents > 0 ? isglist[0].iov_base : NULL));
-@@ -171,7 +171,7 @@ static void process_request(struct xio_m
- 	if (++cnt == print_counter) {
- 		struct xio_iovec_ex *sglist = vmsg_sglist(&req->in);
- 
--		printf("**** request complete [%lu] %s - %s [%zd]\n",
-+		printf("**** request complete [%" PRIu64 "] %s - %s [%zd]\n",
- 		       (req->sn+1),
- 		       (char *)req->in.header.iov_base,
- 		       (char *)sglist[0].iov_base,
-@@ -409,7 +409,7 @@ static int on_msg_error(struct xio_sessi
- {
- 	switch (msg->type) {
- 	case XIO_MSG_TYPE_REQ:
--		printf("**** [%p] message [%lu] failed. reason: %s\n",
-+		printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
- 		       session, msg->sn, xio_strerror(error));
- 		msg_pool_put(pool, msg);
- 		switch (error) {
-@@ -422,7 +422,7 @@ static int on_msg_error(struct xio_sessi
- 		};
- 		break;
- 	case XIO_MSG_TYPE_RSP:
--		printf("**** [%p] message [%lu] failed. reason: %s\n",
-+		printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
- 		       session, msg->request->sn, xio_strerror(error));
- 		/* message is no longer needed */
- 		switch (error) {
-diff -rup accelio/tests/usr/hello_test_lat/xio_lat_client.c accelio.new/tests/usr/hello_test_lat/xio_lat_client.c
---- accelio/tests/usr/hello_test_lat/xio_lat_client.c	2015-09-03 19:36:25.608337505 -0400
-+++ accelio.new/tests/usr/hello_test_lat/xio_lat_client.c	2015-09-03 19:50:51.111356220 -0400
-@@ -139,7 +139,7 @@ static void process_response(struct xio_
- 		double rxbw = (1.0*pps*rxlen/ONE_MB);
- 		double lat = (1000000.0/pps);
- 
--		printf("transactions per second: %lu, lat: %.2f us, bandwidth: " \
-+		printf("transactions per second: %" PRIu64 ", lat: %.2f us, bandwidth: " \
- 		       "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, RX: %zd B\n",
- 		       pps, lat, txbw, rxbw, txlen, rxlen);
- 		get_time(timeb, 40);
-@@ -312,7 +312,7 @@ static int on_msg_error(struct xio_sessi
- 			struct xio_msg  *msg,
- 			void *cb_user_context)
- {
--	printf("**** [%p] message [%lu] failed. reason: %s\n",
-+	printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
- 	       session, msg->sn, xio_strerror(error));
- 
- 	msg_pool_put(pool, msg);
-diff -rup accelio/tests/usr/hello_test_lat/xio_lat_server.c accelio.new/tests/usr/hello_test_lat/xio_lat_server.c
---- accelio/tests/usr/hello_test_lat/xio_lat_server.c	2015-09-03 19:36:25.608337505 -0400
-+++ accelio.new/tests/usr/hello_test_lat/xio_lat_server.c	2015-09-03 19:51:16.803475442 -0400
-@@ -103,7 +103,7 @@ static void process_request(struct xio_m
- 	if (++cnt == PRINT_COUNTER) {
- 		struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in);
- 
--		printf("**** message [%lu] %s - %s\n",
-+		printf("**** message [%" PRIu64 "] %s - %s\n",
- 		       (msg->sn+1),
- 		       (char *)msg->in.header.iov_base,
- 		       (char *)sglist[0].iov_base);
-@@ -209,7 +209,7 @@ static int on_msg_error(struct xio_sessi
- 			struct xio_msg  *msg,
- 			void *cb_user_context)
- {
--	printf("**** [%p] message [%lu] failed. reason: %s\n",
-+	printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
- 	       session, msg->sn, xio_strerror(error));
- 
- 	msg_pool_put(pool, msg);
-diff -rup accelio/tests/usr/hello_test_mt/xio_mt_client.c accelio.new/tests/usr/hello_test_mt/xio_mt_client.c
---- accelio/tests/usr/hello_test_mt/xio_mt_client.c	2015-09-03 19:36:25.608337505 -0400
-+++ accelio.new/tests/usr/hello_test_mt/xio_mt_client.c	2015-09-03 19:47:39.218465755 -0400
-@@ -179,12 +179,12 @@ static void process_response(struct thre
- 		double txbw = (1.0*pps*tdata->stat.txlen/ONE_MB);
- 		double rxbw = (1.0*pps*tdata->stat.rxlen/ONE_MB);
- 
--		printf("transactions per second: %lu, bandwidth: " \
-+		printf("transactions per second: %" PRIu64 ", bandwidth: " \
- 		       "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, " \
- 		       "RX: %zd B\n",
- 		       pps, txbw, rxbw, tdata->stat.txlen, tdata->stat.rxlen);
- 		get_time(timeb, 40);
--		printf("[%s] thread [%d] - tid:%p  - message [%lu] " \
-+		printf("[%s] thread [%d] - tid:%p  - message [%" PRIu64 "] " \
- 		       "%s - %s\n",
- 		       timeb,
- 		       tdata->affinity,
-@@ -416,11 +416,11 @@ static int on_msg_error(struct xio_sessi
- 	struct thread_data  *tdata = (struct thread_data *)cb_user_context;
- 
- 	if (direction == XIO_MSG_DIRECTION_OUT) {
--		printf("**** [%p] message %lu failed. reason: %s\n",
-+		printf("**** [%p] message %" PRIu64 " failed. reason: %s\n",
- 		       session, msg->sn, xio_strerror(error));
- 	} else {
- 		xio_release_response(msg);
--		printf("**** [%p] message %lu failed. reason: %s\n",
-+		printf("**** [%p] message %" PRIu64 " failed. reason: %s\n",
- 		       session, msg->request->sn, xio_strerror(error));
- 	}
- 
-diff -rup accelio/tests/usr/hello_test_mt/xio_mt_server.c accelio.new/tests/usr/hello_test_mt/xio_mt_server.c
---- accelio/tests/usr/hello_test_mt/xio_mt_server.c	2015-09-03 19:36:25.608337505 -0400
-+++ accelio.new/tests/usr/hello_test_mt/xio_mt_server.c	2015-09-03 19:48:02.876575538 -0400
-@@ -171,7 +171,7 @@ static void process_request(struct threa
- 	if (++tdata->stat.cnt == PRINT_COUNTER) {
- 		struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in);
- 
--		printf("thread [%d] - message [%lu] %s - %s\n",
-+		printf("thread [%d] - message [%" PRIu64 "] %s - %s\n",
- 		       tdata->affinity,
- 		       (msg->sn+1),
- 		       (char *)msg->in.header.iov_base,
-@@ -260,7 +260,7 @@ static int on_msg_error(struct xio_sessi
- {
- 	struct thread_data	*tdata = (struct thread_data *)cb_user_context;
- 
--	printf("**** [%p] message [%lu] failed. reason: %s\n",
-+	printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
- 	       session, msg->request->sn, xio_strerror(error));
- 
- 	msg_pool_put(tdata->pool, msg);
-diff -rup accelio/tests/usr/hello_test_oneway/xio_oneway_client.c accelio.new/tests/usr/hello_test_oneway/xio_oneway_client.c
---- accelio/tests/usr/hello_test_oneway/xio_oneway_client.c	2015-09-03 19:36:25.609337510 -0400
-+++ accelio.new/tests/usr/hello_test_oneway/xio_oneway_client.c	2015-09-03 19:54:18.142316932 -0400
-@@ -150,11 +150,11 @@ static void process_rx_message(struct ow
- 
- 		double rxbw = (1.0*pps*ow_params->rx_stat.xlen/ONE_MB);
- 
--		printf("transactions per second: %lu, bandwidth: " \
-+		printf("transactions per second: %" PRIu64 ", bandwidth: " \
- 		       "RX: %.2f MB/s, RX: %zd B\n",
- 		       pps, rxbw, ow_params->rx_stat.xlen);
- 		get_time(timeb, 40);
--		printf("**** [%s] - message [%lu] %s - %s\n",
-+		printf("**** [%s] - message [%" PRIu64 "] %s - %s\n",
- 		       timeb, (msg->sn + 1),
- 		       (char *)msg->in.header.iov_base,
- 		       (char *)(inents > 0 ? isglist[0].iov_base : NULL));
-@@ -202,11 +202,11 @@ static void process_tx_message(struct ow
- 
- 		double txbw = (1.0*pps*ow_params->tx_stat.xlen/ONE_MB);
- 
--		printf("transactions per second: %lu, bandwidth: " \
-+		printf("transactions per second: %" PRIu64 ", bandwidth: " \
- 		       "TX %.2f MB/s,length: TX: %zd B\n",
- 		       pps, txbw, ow_params->tx_stat.xlen);
- 		get_time(timeb, 40);
--		printf("**** [%s] - message [%lu] %s - %s\n",
-+		printf("**** [%s] - message [%" PRIu64 "] %s - %s\n",
- 		       timeb, (msg->sn + 1),
- 		       (char *)msg->out.header.iov_base,
- 		       (char *)(onents > 0 ? osglist[0].iov_base : NULL));
-@@ -349,7 +349,7 @@ static int on_msg_error(struct xio_sessi
- 	struct ow_test_params *ow_params =
- 				(struct ow_test_params *)cb_user_context;
- 
--	printf("**** [%p] message [%lu] failed. reason: %s\n",
-+	printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
- 	       session, msg->sn, xio_strerror(error));
- 
- 	msg_pool_put(ow_params->pool, msg);
-diff -rup accelio/tests/usr/hello_test_oneway/xio_oneway_server.c accelio.new/tests/usr/hello_test_oneway/xio_oneway_server.c
---- accelio/tests/usr/hello_test_oneway/xio_oneway_server.c	2015-09-03 19:36:25.609337510 -0400
-+++ accelio.new/tests/usr/hello_test_oneway/xio_oneway_server.c	2015-09-03 19:54:32.797384938 -0400
-@@ -112,7 +112,7 @@ static void process_request(struct xio_m
- 	if (++cnt == PRINT_COUNTER) {
- 		struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in);
- 
--		printf("**** message [%lu] %s - %s\n",
-+		printf("**** message [%" PRIu64 "] %s - %s\n",
- 		       (msg->sn+1),
- 		       (char *)msg->in.header.iov_base,
- 		       (char *)sglist[0].iov_base);
-@@ -299,7 +299,7 @@ static int on_msg_error(struct xio_sessi
- 	struct ow_test_params *ow_params =
- 				(struct ow_test_params *)cb_user_context;
- 
--	printf("**** [%p] message [%lu] failed. reason: %s\n",
-+	printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
- 	       session, msg->sn, xio_strerror(error));
- 
- 	msg_pool_put(ow_params->pool, msg);
-diff -rup accelio/tests/usr/hello_test_ow/xio_ow_client.c accelio.new/tests/usr/hello_test_ow/xio_ow_client.c
---- accelio/tests/usr/hello_test_ow/xio_ow_client.c	2015-09-03 19:36:25.609337510 -0400
-+++ accelio.new/tests/usr/hello_test_ow/xio_ow_client.c	2015-09-03 19:52:24.905791466 -0400
-@@ -152,7 +152,7 @@ for (i = 0; i < onents; i++)
- 
- 		double txbw = (1.0*pps*test_params->stat.txlen/ONE_MB);
- 
--		printf("transactions per second: %lu, bandwidth: " \
-+		printf("transactions per second: %" PRIu64 ", bandwidth: " \
- 		       "TX %.2f MB/s, length: TX: %zd B\n",
- 		       pps, txbw,
- 		       test_params->stat.txlen);
-@@ -181,8 +181,8 @@ static int on_session_event(struct xio_s
- 		test_params->closed = 1;
- 		break;
- 	case XIO_SESSION_CONNECTION_TEARDOWN_EVENT:
--		printf("nsent:%lu, ncomp:%lu, " \
--		       "delta:%lu\n",
-+		printf("nsent:%" PRIu64 ", ncomp:%" PRIu64 ", " \
-+		       "delta:%" PRIu64 "\n",
- 		       test_params->nsent, test_params->ncomp,
- 		       test_params->nsent-test_params->ncomp);
- 
-@@ -357,7 +357,7 @@ static int on_msg_error(struct xio_sessi
- {
- 	struct test_params *test_params = (struct test_params *)cb_user_context;
- 
--	printf("**** [%p] message [%lu] failed. reason: %s\n",
-+	printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
- 	       session, msg->sn, xio_strerror(error));
- 
- 	msg_pool_put(test_params->pool, msg);
-diff -rup accelio/tests/usr/hello_test_ow/xio_ow_server.c accelio.new/tests/usr/hello_test_ow/xio_ow_server.c
---- accelio/tests/usr/hello_test_ow/xio_ow_server.c	2015-09-03 19:36:25.609337510 -0400
-+++ accelio.new/tests/usr/hello_test_ow/xio_ow_server.c	2015-09-03 19:52:57.947944796 -0400
-@@ -110,7 +110,7 @@ static void process_request(struct xio_m
- 	if (++cnt == PRINT_COUNTER) {
- 		struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in);
- 
--		printf("**** message [%lu] %s - %s\n",
-+		printf("**** message [%" PRIu64 "] %s - %s\n",
- 		       (msg->sn+1),
- 		       (char *)msg->in.header.iov_base,
- 		       (char *)sglist[0].iov_base);
-@@ -145,7 +145,7 @@ static int on_session_event(struct xio_s
- 		xio_disconnect(event_data->conn);
- 		break;
- 	case XIO_SESSION_CONNECTION_TEARDOWN_EVENT:
--		printf("last recv:%lu\n",
-+		printf("last recv:%" PRIu64 "\n",
- 		       test_params->nrecv);
- 
- 		xio_connection_destroy(event_data->conn);
-@@ -215,7 +215,7 @@ static int on_msg_error(struct xio_sessi
- 			struct xio_msg  *msg,
- 			void *cb_user_context)
- {
--	printf("**** [%p] message [%lu] failed. reason: %s\n",
-+	printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n",
- 	       session, msg->request->sn, xio_strerror(error));
- 
- 	return 0;
diff --git a/pkgs/development/libraries/boost/1.64.nix b/pkgs/development/libraries/boost/1.64.nix
new file mode 100644
index 00000000000..1cf9bfa51f4
--- /dev/null
+++ b/pkgs/development/libraries/boost/1.64.nix
@@ -0,0 +1,12 @@
+{ stdenv, callPackage, fetchurl, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "1.64.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/boost/boost_1_64_0.tar.bz2";
+    # SHA256 from http://www.boost.org/users/history/version_1_64_0.html
+    sha256 = "7bcc5caace97baa948931d712ea5f37038dbb1c5d89b43ad4def4ed7cb683332";
+  };
+
+})
diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix
index a4b0090296f..4ab61a2d282 100644
--- a/pkgs/development/libraries/glpk/default.nix
+++ b/pkgs/development/libraries/glpk/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "glpk-4.62";
+  name = "glpk-4.63";
 
   src = fetchurl {
     url = "mirror://gnu/glpk/${name}.tar.gz";
-    sha256 = "0w7s3869ybwyq9a4490dikpib1qp3jnn5nqz1vvwqy1qz3ilnvh9";
+    sha256 = "1xp7nclmp8inp20968bvvfcwmz3mz03sbm0v3yjz8aqwlpqjfkci";
   };
 
   doCheck = true;
diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix
index c67a3c708b3..441ca2e5571 100644
--- a/pkgs/development/libraries/gstreamer/libav/default.nix
+++ b/pkgs/development/libraries/gstreamer/libav/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://gstreamer.freedesktop.org";
     license = stdenv.lib.licenses.lgpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix
index 0f21180f691..a6fb4ec515a 100644
--- a/pkgs/development/libraries/libextractor/default.nix
+++ b/pkgs/development/libraries/libextractor/default.nix
@@ -7,11 +7,11 @@ assert gtkSupport -> glib != null && gtk3 != null;
 assert videoSupport -> ffmpeg != null && libmpeg2 != null;
 
 stdenv.mkDerivation rec {
-  name = "libextractor-1.3";
+  name = "libextractor-1.4";
 
   src = fetchurl {
     url = "mirror://gnu/libextractor/${name}.tar.gz";
-    sha256 = "0zvv7wd011npcx7yphw9bpgivyxz6mlp87a57n96nv85k96dd2l6";
+    sha256 = "0v7ns5jhsyp1wzvbaydfgxnva5zd63gkzm9djhckmam9liq824l4";
   };
 
   preConfigure =
diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix
index 61926dad24d..e3e4e000773 100644
--- a/pkgs/development/libraries/libidn2/default.nix
+++ b/pkgs/development/libraries/libidn2/default.nix
@@ -1,21 +1,21 @@
-{ fetchurl, stdenv, libiconv, libunistring, help2man }:
+{ fetchurl, stdenv, libiconv, libunistring, help2man, ronn }:
 
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "libidn2-${version}";
-  version = "2.0.2";
+  version = "2.0.3";
 
   src = fetchurl {
     url = "mirror://gnu/gnu/libidn/${name}.tar.gz";
-    sha256 = "1azfhz8zj1c27a5k2cspnkzkyfhcsqx2yc2sygh720dbn8l2imlc";
+    sha256 = "1k88acdf242a6lbznr0h6f02frsqyqw4smw1nznibim5wyf18da3";
   };
 
   outputs = [ "bin" "dev" "out" "info" "devdoc" ];
 
   patches = optional stdenv.isDarwin ./fix-error-darwin.patch;
 
-  buildInputs = [ libunistring ]
+  buildInputs = [ libunistring ronn ]
     ++ optionals stdenv.isDarwin [ libiconv help2man ];
 
   meta = {
diff --git a/pkgs/development/libraries/linenoise-ng/default.nix b/pkgs/development/libraries/linenoise-ng/default.nix
new file mode 100644
index 00000000000..b3333d58242
--- /dev/null
+++ b/pkgs/development/libraries/linenoise-ng/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, lib, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+  name = "linenoise-ng-${version}";
+  version = "1.0.1";
+
+  src = fetchFromGitHub {
+    owner = "arangodb";
+    repo = "linenoise-ng";
+    rev = "v${version}";
+    sha256 = "176iz0kj0p8d8i3jqps4z8xkxwl3f1986q88i9xg5fvqgpzsxp20";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = {
+    homepage = "https://github.com/arangodb/linenoise-ng";
+    description = "A small, portable GNU readline replacement for Linux, Windows and MacOS which is capable of handling UTF-8 characters";
+    maintainers = with stdenv.lib.maintainers; [ cstrahan ];
+    platforms = stdenv.lib.platforms.all;
+    license = stdenv.lib.licenses.bsd3;
+  };
+}
diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix
index 25aeb3a6da1..a791c899485 100644
--- a/pkgs/development/libraries/rocksdb/default.nix
+++ b/pkgs/development/libraries/rocksdb/default.nix
@@ -6,6 +6,8 @@
 
 # Malloc implementation
 , jemalloc ? null, gperftools ? null
+
+, enableLite ? false
 }:
 
 let
@@ -35,6 +37,9 @@ stdenv.mkDerivation rec {
   CMAKE_CXX_FLAGS = "-std=gnu++11";
   JEMALLOC_LIB = stdenv.lib.optionalString (malloc == jemalloc) "-ljemalloc";
 
+  ${if enableLite then "LIBNAME" else null} = "librocksdb_lite";
+  ${if enableLite then "CXXFLAGS" else null} = "-DROCKSDB_LITE=1";
+
   buildFlags = [
     "DEBUG_LEVEL=0"
     "shared_lib"
diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
index 46cc922917e..dbfa05744e5 100644
--- a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
@@ -6,13 +6,13 @@ else
 
 stdenv.mkDerivation rec {
    name = "ocaml${ocaml.version}-ocaml-migrate-parsetree-${version}";
-   version = "0.7";
+   version = "1.0";
 
    src = fetchFromGitHub {
      owner = "let-def";
      repo = "ocaml-migrate-parsetree";
      rev = "v${version}";
-     sha256 = "142svvixhz153argd3khk7sr38dhiy4w6sck4766f8b48p41pp3m";
+     sha256 = "0j1d3scakny2b656gyz5z2h8987b5aqw7iwssxgfbhwcszn6sps4";
    };
 
    buildInputs = [ ocaml findlib ocamlbuild jbuilder ];
diff --git a/pkgs/development/python-modules/augeas/default.nix b/pkgs/development/python-modules/augeas/default.nix
new file mode 100644
index 00000000000..8934e1b81a8
--- /dev/null
+++ b/pkgs/development/python-modules/augeas/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, lib, buildPythonPackage, fetchFromGitHub, augeas, cffi }:
+buildPythonPackage rec {
+    name = "augeas-${version}";
+    version = "1.0.2";
+
+    src = fetchFromGitHub {
+      owner = "hercules-team";
+      repo = "python-augeas";
+      rev = "v${version}";
+      sha256 = "1xk51m58ym3qpf0z5y98kzxb5jw7s92rca0v1yflj422977najxh";
+    };
+
+    # TODO: not very nice!
+    postPatch =
+      let libname = if stdenv.isDarwin then "libaugeas.dylib" else "libaugeas.so";
+      in
+      ''
+        substituteInPlace augeas/ffi.py \
+          --replace 'ffi.dlopen("augeas")' \
+                    'ffi.dlopen("${lib.makeLibraryPath [augeas]}/${libname}")'
+      '';
+
+    propagatedBuildInputs = [ cffi augeas ];
+
+    doCheck = false;
+
+    meta = with lib; {
+      description = "Pure python bindings for augeas";
+      homepage = https://github.com/hercules-team/python-augeas;
+      license = licenses.lgpl2Plus;
+      platforms = platforms.unix;
+    };
+}
diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix
index b7f9d713927..86ef792a437 100644
--- a/pkgs/development/python-modules/yapf/default.nix
+++ b/pkgs/development/python-modules/yapf/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "yapf";
-  version = "0.11.0";
+  version = "0.16.3";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "14kb9gxw39zhvrijhp066b4bm6bgv35iw56c394y4dyczpha0dij";
+    sha256 = "1qxq41y65saljw0jk5fzinvynr9fhwzqcjsxxs8bn78in073x7a2";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/build-managers/tup/default.nix b/pkgs/development/tools/build-managers/tup/default.nix
index 872a65889df..828fe20ecc5 100644
--- a/pkgs/development/tools/build-managers/tup/default.nix
+++ b/pkgs/development/tools/build-managers/tup/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "tup-${version}";
-  version = "0.7.3";
+  version = "0.7.5";
 
   src = fetchFromGitHub {
     owner = "gittup";
     repo = "tup";
     rev = "v${version}";
-    sha256 = "1x2grwmlf2izip4djb8cjwgl8p3x0bmfqwzjsc017mqi17qkijy8";
+    sha256 = "0jzp1llq6635ldb7j9qb29j2k0x5mblimdqg3179dvva1hv0ia23";
   };
 
   buildInputs = [ fuse pkgconfig ];
diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix
index 5ec93462dec..fe6bfc711e6 100644
--- a/pkgs/development/tools/gocode/default.nix
+++ b/pkgs/development/tools/gocode/default.nix
@@ -2,14 +2,19 @@
 
 buildGoPackage rec {
   name = "gocode-${version}";
-  version = "20170219-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "f54790e5d4386b60b80d0c6f9e59db345839d7cc";
-  
+  version = "20170530-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "f1eef9a6ba005abb145d7b58fdd225e83a3c6a05";
+
   goPackagePath = "github.com/nsf/gocode";
 
+  # we must allow references to the original `go` package,
+  # because `gocode` needs to dig into $GOROOT to provide completions for the
+  # standard packages.
+  allowGoReference = true;
+
   src = fetchgit {
     inherit rev;
     url = "https://github.com/nsf/gocode";
-    sha256 = "1x9wdahpdkqwqkipxl5m0sh8d59i389rdvrsyz57slpfd0hapkks";
+    sha256 = "1hkr46ikrprx203i2yr6xds1bzxggblh7bg026m2cda6dxgpnsgw";
   };
 }
diff --git a/pkgs/development/tools/haskell/haste/haste-Cabal.nix b/pkgs/development/tools/haskell/haste/haste-Cabal.nix
deleted file mode 100644
index 45a60172e39..00000000000
--- a/pkgs/development/tools/haskell/haste/haste-Cabal.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-# Haste requires its own patched up version of Cabal that's not on hackage
-{ mkDerivation, array, base, binary, bytestring, containers
-, deepseq, directory, extensible-exceptions, filepath, old-time
-, pretty, process, QuickCheck, regex-posix, stdenv, tasty
-, tasty-hunit, tasty-quickcheck, time, unix
-, fetchFromGitHub
-}:
-
-mkDerivation {
-  pname = "Cabal";
-  version = "1.23.0.0";
-  src = fetchFromGitHub {
-    owner = "valderman";
-    repo = "cabal";
-    rev = "a1962987ba32d5e20090830f50c6afdc78dae005";
-    sha256 = "1gjmscfsikcvgkv6zricpfxvj23wxahndm784lg9cpxrc3pn5hvh";
-  };
-  libraryHaskellDepends = [
-    array base binary bytestring containers deepseq directory filepath
-      pretty process time unix
-  ];
-  testHaskellDepends = [
-    base bytestring containers directory extensible-exceptions filepath
-      old-time pretty process QuickCheck regex-posix tasty tasty-hunit
-      tasty-quickcheck unix
-  ];
-  prePatch = ''
-    rm -rf cabal-install
-    cd Cabal
-    '';
-  doCheck = false;
-  homepage = "http://www.haskell.org/cabal/";
-  description = "A framework for packaging Haskell software";
-  license = stdenv.lib.licenses.bsd3;
-}
diff --git a/pkgs/development/tools/haskell/haste/haste-cabal-install.nix b/pkgs/development/tools/haskell/haste/haste-cabal-install.nix
deleted file mode 100644
index dd140409173..00000000000
--- a/pkgs/development/tools/haskell/haste/haste-cabal-install.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-# Haste requires its own patched up version of cabal-install that's not on hackage
-{ mkDerivation, array, base, bytestring, Cabal, containers
-, directory, extensible-exceptions, filepath, HTTP, mtl, network
-, network-uri, pretty, process, QuickCheck, random, regex-posix
-, stdenv, stm, tagged, tasty, tasty-hunit, tasty-quickcheck, time
-, unix, zlib
-, fetchFromGitHub
-}:
-
-mkDerivation {
-  pname = "cabal-install";
-  version = "1.23.0.0";
-  src = fetchFromGitHub {
-    owner = "valderman";
-    repo = "cabal";
-    rev = "a1962987ba32d5e20090830f50c6afdc78dae005";
-    sha256 = "1gjmscfsikcvgkv6zricpfxvj23wxahndm784lg9cpxrc3pn5hvh";
-  };
-  isLibrary = false;
-  isExecutable = true;
-  executableHaskellDepends = [
-    array base bytestring Cabal containers directory filepath HTTP mtl
-    network network-uri pretty process random stm time unix zlib
-  ];
-  testHaskellDepends = [
-    array base bytestring Cabal containers directory
-    extensible-exceptions filepath HTTP mtl network network-uri pretty
-    process QuickCheck random regex-posix stm tagged tasty tasty-hunit
-    tasty-quickcheck time unix zlib
-  ];
-  prePatch = ''
-    rm -rf Cabal
-    cd cabal-install
-  '';
-  postInstall = ''
-    mkdir $out/etc
-    mv bash-completion $out/etc/bash_completion.d
-
-    # Manually added by Nix maintainer
-    mv -v $out/etc/bash_completion.d/cabal $out/etc/bash_completion.d/haste-cabal
-  '';
-  doCheck = false;
-  homepage = "http://www.haskell.org/cabal/";
-  description = "The command-line interface for Cabal and Hackage";
-  license = stdenv.lib.licenses.bsd3;
-}
diff --git a/pkgs/development/tools/haskell/haste/haste-compiler.nix b/pkgs/development/tools/haskell/haste/haste-compiler.nix
deleted file mode 100644
index f9aa5abae57..00000000000
--- a/pkgs/development/tools/haskell/haste/haste-compiler.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ mkDerivation
-, overrideCabal
-, super-haste-compiler
-}:
-
-overrideCabal super-haste-compiler (drv: {
-  configureFlags = [ "-f-portable" ];
-  prePatch = ''
-    # Get ghc libdir by invoking ghc and point to haste-cabal binary
-    substituteInPlace src/Haste/Environment.hs \
-      --replace \
-        'hasteGhcLibDir = hasteSysDir' \
-        'hasteGhcLibDir = head $ lines $ either (error . show) id $ unsafePerformIO $ shell $ run "ghc" ["--print-libdir"] ""' \
-      --replace \
-        'hasteCabalBinary = hasteBinDir </> "haste-cabal" ++ binaryExt' \
-        'hasteCabalBinary = "haste-cabal" ++ binaryExt'
-
-    # Don't try to download/install haste-cabal in haste-boot:
-    patch src/haste-boot.hs << EOF
-    @@ -178,10 +178,6 @@
-                             pkgSysLibDir, jsmodSysDir, pkgSysDir]
-
-           mkdir True (hasteCabalRootDir portableHaste)
-    -      case getHasteCabal cfg of
-    -        Download    -> installHasteCabal portableHaste tmpdir
-    -        Prebuilt fp -> copyHasteCabal portableHaste fp
-    -        Source mdir -> buildHasteCabal portableHaste (maybe "../cabal" id mdir)
-
-           -- Spawn off closure download in the background.
-           dir <- pwd -- use absolute path for closure to avoid dir changing race
-    EOF
-  '';
-})
diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
index ed6c7d73fdb..b3df9c605e0 100644
--- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
+++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
@@ -2,15 +2,15 @@
 
 stdenv.mkDerivation rec {
   name = "multi-ghc-travis-${version}";
-  version = "git-2017-07-26";
+  version = "git-2017-07-27";
 
   buildInputs = [ ghc ];
 
   src = fetchFromGitHub {
     owner = "hvr";
     repo = "multi-ghc-travis";
-    rev = "800980d76f7a74f3cdfd76b3dff351d52d2c84ee";
-    sha256 = "03y8b4iz5ly9vkjc551c1bxalg1vl4k2sic327s3vh00jmjgvhz6";
+    rev = "f21804164cf646d682d7da668a625cdbd8baf05a";
+    sha256 = "07l3qzlc2hl7g5wbgqh8ld8ynl004i6m7p903667gbhs7sw03nbl";
   };
 
   installPhase = ''
diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix
index fe1bb771fca..d5423fea2be 100644
--- a/pkgs/development/tools/misc/hydra/default.nix
+++ b/pkgs/development/tools/misc/hydra/default.nix
@@ -62,15 +62,15 @@ let
   };
 in releaseTools.nixBuild rec {
   name = "hydra-${version}";
-  version = "2017-06-22";
+  version = "2017-07-24";
 
   inherit stdenv;
 
   src = fetchFromGitHub {
     owner = "NixOS";
     repo = "hydra";
-    rev = "803833aba77e1082c14857aa26933fc7fe5ae190";
-    sha256 = "1cnxpsan8l6fnbr73n0qxxq1szlda1n3qfkk9k9ic8ijk7md4pvs";
+    rev = "a6d9201947aa1468d31ef5c2651251ceeefceb5c";
+    sha256 = "0hk5pxzn94ip3nyccxl91zc5n6wd1h2zcbhdq9p38wa4lrnnm5zv";
   };
 
   buildInputs =
diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix
index 2a6b6880183..9b4fd05dc0a 100644
--- a/pkgs/development/tools/misc/swig/3.x.nix
+++ b/pkgs/development/tools/misc/swig/3.x.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "swig-${version}";
-  version = "3.0.10";
+  version = "3.0.12";
 
   src = fetchFromGitHub {
     owner = "swig";
     repo = "swig";
     rev = "rel-${version}";
-    sha256 = "049rj883r9mf2bgabj3b03p7cnmqgl5939lmh8v5nnia24zb51jg";
+    sha256 = "1wyffskbkzj5zyhjnnpip80xzsjcr3p0q5486z3wdwabnysnhn8n";
   };
 
   nativeBuildInputs = [ autoconf automake libtool bison ];
diff --git a/pkgs/development/tools/mypy/default.nix b/pkgs/development/tools/mypy/default.nix
index eb6e50840a5..a68b29dee24 100644
--- a/pkgs/development/tools/mypy/default.nix
+++ b/pkgs/development/tools/mypy/default.nix
@@ -1,22 +1,24 @@
-{ stdenv, fetchurl, python35Packages }:
-python35Packages.buildPythonApplication rec {
-  name = "mypy-${version}";
-  version = "0.501";
+{ stdenv, fetchPypi, buildPythonApplication, lxml, typed-ast }:
+
+buildPythonApplication rec {
+  name = "${pname}-${version}";
+  pname = "mypy";
+  version = "0.511";
 
   # Tests not included in pip package.
   doCheck = false;
 
-  src = fetchurl {
-    url = "mirror://pypi/m/mypy/${name}.tar.gz";
-    sha256 = "164g3dq2vzxa53n9lgvmbapg41qiwcxk1w9mvzmnqksvql5vm60h";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1vmfyi6zh49mi7rmns5hjgpqshq7islxwsgp80j1izf82r8xgx1z";
   };
 
-  propagatedBuildInputs = with python35Packages; [ lxml typed-ast ];
+  propagatedBuildInputs = [ lxml typed-ast ];
 
   meta = with stdenv.lib; {
     description = "Optional static typing for Python";
     homepage    = "http://www.mypy-lang.org";
     license     = licenses.mit;
-    maintainers = with maintainers; [ martingms ];
+    maintainers = with maintainers; [ martingms lnl7 ];
   };
 }
diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix
index b9316e2ca70..296687c5d92 100644
--- a/pkgs/games/hedgewars/default.nix
+++ b/pkgs/games/hedgewars/default.nix
@@ -6,7 +6,7 @@
 let
   ghc = ghcWithPackages (pkgs: with pkgs; [
           network vector utf8-string bytestring-show random hslogger
-          dataenc SHA entropy zlib_0_5_4_2
+          dataenc SHA entropy pkgs.zlib
         ]);
 in
 stdenv.mkDerivation rec {
diff --git a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix
index ee14e4a52db..228f56d47ae 100644
--- a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix
+++ b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgsi686Linux, dpkg, makeWrapper, coreutils, gnused, gawk, file, cups, patchelf, utillinux, vimNox
+{ stdenv, fetchurl, pkgsi686Linux, dpkg, makeWrapper, coreutils, gnused, gawk, file, cups, patchelf, utillinux, xxd
 , ghostscript, a2ps }:
 
 # Why:
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
     ${utillinux}/bin/hexdump -ve '1/1 "%.2X"' $out/usr/bin/brprintconf_mfcj6510dw | \
     sed 's.2F6F70742F62726F746865722F5072696E746572732F25732F696E662F6272257366756E63.62726d66636a36353130647766756e63000000000000000000000000000000000000000000.' | \
     sed 's.2F6F70742F62726F746865722F5072696E746572732F25732F696E662F627225737263.62726D66636A3635313064777263000000000000000000000000000000000000000000.' | \
-    ${vimNox}/bin/xxd -r -p > $out/usr/bin/brprintconf_mfcj6510dw_patched
+    ${xxd}/bin/xxd -r -p > $out/usr/bin/brprintconf_mfcj6510dw_patched
     chmod +x $out/usr/bin/brprintconf_mfcj6510dw_patched
     #executing from current dir. segfaults if it's not r\w.
     mkdir -p $out/bin
@@ -79,11 +79,11 @@ stdenv.mkDerivation rec {
     '';
 
   meta = with stdenv.lib; {
-    homepage = http://www.brother.com/;
-    description = "Brother MFC-J6510DW LPR driver";
-    license = with licenses; unfree;
-    platforms = with platforms; linux;
+    description  = "Brother MFC-J6510DW LPR driver";
     downloadPage = http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj6510dw_all&os=128;
-    maintainers = with maintainers; [ ramkromberg ];
+    homepage     = http://www.brother.com/;
+    license      = with licenses; unfree;
+    maintainers  = with maintainers; [ ramkromberg ];
+    platforms    = with platforms; linux;
   };
 }
diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix
index fec0634ba68..375afcecf70 100644
--- a/pkgs/misc/cups/filters.nix
+++ b/pkgs/misc/cups/filters.nix
@@ -9,11 +9,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "cups-filters-${version}";
-  version = "1.14.0";
+  version = "1.15.0";
 
   src = fetchurl {
     url = "http://openprinting.org/download/cups-filters/${name}.tar.xz";
-    sha256 = "1v553wvr8qdwb1g04if7cw1mfm42vs6xfyg0cvzvbng6yr6jg93s";
+    sha256 = "0g6jmbzgvsq4dq6jaczr6fslpv3692v8yvvmqgw08sb3aly7kgd3";
   };
 
   nativeBuildInputs = [ pkgconfig makeWrapper ];
diff --git a/pkgs/misc/emulators/cdemu/analyzer.nix b/pkgs/misc/emulators/cdemu/analyzer.nix
index e39e5285039..e0fe451ce24 100644
--- a/pkgs/misc/emulators/cdemu/analyzer.nix
+++ b/pkgs/misc/emulators/cdemu/analyzer.nix
@@ -1,8 +1,8 @@
 { callPackage, gtk3, glib, libxml2, gnuplot, makeWrapper, stdenv, gnome3, gdk_pixbuf, librsvg, intltool }:
 let pkg = import ./base.nix {
-  version = "3.0.1";
+  version = "3.1.0";
   pkgName = "image-analyzer";
-  pkgSha256 = "19x5hx991pl55ddm2wjd2ylm2hiz9yvzgrwmpnsqr9zqc4lja682";
+  pkgSha256 = "1pr23kxx83xp83h27fkdv86f3bxclkx056f9jx8jhnpn113xp7r2";
 };
 in callPackage pkg {
   buildInputs = [ glib gtk3 libxml2 gnuplot (callPackage ./libmirage.nix {}) makeWrapper
diff --git a/pkgs/misc/emulators/cdemu/client.nix b/pkgs/misc/emulators/cdemu/client.nix
index 3a5850e10e9..ec4341a2945 100644
--- a/pkgs/misc/emulators/cdemu/client.nix
+++ b/pkgs/misc/emulators/cdemu/client.nix
@@ -1,11 +1,12 @@
 { callPackage, pythonPackages, intltool, makeWrapper }:
 let pkg = import ./base.nix {
-  version = "3.0.3";
+  version = "3.1.0";
   pkgName = "cdemu-client";
-  pkgSha256 = "1bfj7bc10z20isdg0h8sfdvnwbn6c49494mrmq6jwrfbqvby25x9";
+  pkgSha256 = "0s6q923g5vkahw5fki6c7a25f68y78zfx4pfsy0xww0z1f5hfsik";
 };
 in callPackage pkg {
-  buildInputs = [ pythonPackages.python pythonPackages.dbus-python intltool makeWrapper ];
+  buildInputs = [ pythonPackages.python pythonPackages.dbus-python pythonPackages.pygobject3
+                  intltool makeWrapper ];
   drvParams = {
     postFixup = ''
       wrapProgram $out/bin/cdemu \
diff --git a/pkgs/misc/emulators/cdemu/daemon.nix b/pkgs/misc/emulators/cdemu/daemon.nix
index ef58ff7f58f..587224e71d7 100644
--- a/pkgs/misc/emulators/cdemu/daemon.nix
+++ b/pkgs/misc/emulators/cdemu/daemon.nix
@@ -1,9 +1,9 @@
-{ callPackage, glib, libao }:
+{ callPackage, glib, libao, intltool }:
 let pkg = import ./base.nix {
-  version = "3.0.5";
+  version = "3.1.0";
   pkgName = "cdemu-daemon";
-  pkgSha256 = "1cc0yxf1y5dxinv7md1cqhdjsbqb69v9jygrdq5c20mrkqaajz1i";
+  pkgSha256 = "0kxwhwjvcr40sjlrvln9gasjwkkfc3wxpcz0rxmffp92w8phz3s9";
 };
 in callPackage pkg {
-  buildInputs = [ glib libao (callPackage ./libmirage.nix {}) ];
+  buildInputs = [ glib libao (callPackage ./libmirage.nix {}) intltool ];
 }
diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/misc/emulators/cdemu/gui.nix
index 835a690eb69..d6c85c53b42 100644
--- a/pkgs/misc/emulators/cdemu/gui.nix
+++ b/pkgs/misc/emulators/cdemu/gui.nix
@@ -1,9 +1,9 @@
 { callPackage, pythonPackages, gtk3, glib, libnotify, intltool, makeWrapper, gobjectIntrospection, gnome3, gdk_pixbuf, librsvg }:
 let
   pkg = import ./base.nix {
-    version = "3.0.2";
+    version = "3.1.0";
     pkgName = "gcdemu";
-    pkgSha256 = "1kmcr2a0inaddx8wrjh3l1v5ymgwv3r6nv2w05lia51r1yzvb44p";
+    pkgSha256 = "0rmnw302fk9vli22v54qx19lqxy23syxi154klxz2vma009q0p02";
   };
   inherit (pythonPackages) python pygobject3;
 in callPackage pkg {
diff --git a/pkgs/misc/emulators/cdemu/libmirage.nix b/pkgs/misc/emulators/cdemu/libmirage.nix
index c9ba589cf2a..3813ceef611 100644
--- a/pkgs/misc/emulators/cdemu/libmirage.nix
+++ b/pkgs/misc/emulators/cdemu/libmirage.nix
@@ -1,9 +1,9 @@
-{ callPackage, glib, libsndfile, zlib, bzip2, lzma, libsamplerate }:
+{ callPackage, glib, libsndfile, zlib, bzip2, lzma, libsamplerate, intltool }:
 let pkg = import ./base.nix {
-  version = "3.0.5";
+  version = "3.1.0";
   pkgName = "libmirage";
-  pkgSha256 = "01wfxlyviank7k3p27grl1r40rzm744rr80zr9lcjk3y8i5g8ni2";
+  pkgSha256 = "0qvkvnvxqx8hqzcqzh7sqjzgbc1nrd91lzv33lr8c6fgaq8cqzmn";
 };
 in callPackage pkg {
-  buildInputs = [ glib libsndfile zlib bzip2 lzma libsamplerate ];
+  buildInputs = [ glib libsndfile zlib bzip2 lzma libsamplerate intltool ];
 }
diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix
index c1692e1b9a8..2b3d9852815 100644
--- a/pkgs/misc/emulators/cdemu/vhba.nix
+++ b/pkgs/misc/emulators/cdemu/vhba.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "vhba-${version}";
-  version = "20161009";
+  version = "20170610";
 
   src  = fetchurl {
     url = "mirror://sourceforge/cdemu/vhba-module-${version}.tar.bz2";
-    sha256 = "1n9k3z8hppnl5b5vrn41b69wqwdpml6pm0rgc8vq3jqwss5js1nd";
+    sha256 = "1v6r0bgx0a65vlh36b1l2965xybngbpga6rp54k4z74xk0zwjw3r";
   };
 
   makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ];
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 1523010b6d7..be22b71d2b2 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -224,11 +224,11 @@ rec {
   };
 
   The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "The_NERD_tree-2017-06-30";
+    name = "The_NERD_tree-2017-07-17";
     src = fetchgit {
       url = "git://github.com/scrooloose/nerdtree";
-      rev = "2e43ad074bb3b7fafc77b9eea5098047d6fe6e90";
-      sha256 = "1mbj0qcjmrc4n0p9i96rm29qpi5j1shp69iv5kcv8sxiqgfrlqlm";
+      rev = "e2a9929bbea0ec2050f2ea44b7e7bae3ccac66e6";
+      sha256 = "03mygl8ic4awx4js04x0nw2l96kjv4vsldkgrdx0n43sh5i4z7nk";
     };
     dependencies = [];
 
@@ -284,11 +284,11 @@ rec {
   };
 
   clang_complete = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "clang_complete-2017-06-03";
+    name = "clang_complete-2017-07-15";
     src = fetchgit {
       url = "git://github.com/Rip-Rip/clang_complete";
-      rev = "c963df1cd10463166e1245445bff27f28e89f9f7";
-      sha256 = "1y7zx3ywir86mxgg86kb8z7xmxadcmv8ycc2i1y8s7jz6pv2v40l";
+      rev = "c41eea05317526a4ddd3bd389f3723390b196d4d";
+      sha256 = "0bfalbzhy3n1k8bsvnh6aykgj6d17n6qgi9ahp0d8plvbjjvfw6j";
     };
     dependencies = [];
     # In addition to the arguments you pass to your compiler, you also need to
@@ -363,23 +363,12 @@ rec {
 
   };
 
-  forms = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "forms-2012-11-28";
-    src = fetchgit {
-      url = "git://github.com/megaannum/forms";
-      rev = "b601e03fe0a3b8a43766231f4a6217e4492b4f75";
-      sha256 = "19kp1i5c6jmnpbsap9giayqbzlv7vh02mp4mjvicqj9n0nfyay74";
-    };
-    dependencies = ["self"];
-
-  };
-
   fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fugitive-2017-06-08";
+    name = "fugitive-2017-07-12";
     src = fetchgit {
       url = "git://github.com/tpope/vim-fugitive";
-      rev = "be2ff98db543990d7e59a90189733d7a779788fd";
-      sha256 = "1lkdypibsw2p45wrdcc8ambynszdcwiqyh50zhflf2slpd98iz3m";
+      rev = "913fff1cea3aa1a08a360a494fa05555e59147f5";
+      sha256 = "1qxzxk5szm25r7wi39n5s91fjnjgz5xib67risjcwhk6jdv0vzyd";
     };
     dependencies = [];
 
@@ -441,11 +430,11 @@ rec {
   };
 
   deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-nvim-2017-07-05";
+    name = "deoplete-nvim-2017-07-22";
     src = fetchgit {
       url = "https://github.com/Shougo/deoplete.nvim";
-      rev = "376b0c9bbdd30e51a253319ff63762165f30d41a";
-      sha256 = "0r6bwwsl9r40nv02hca1h00wgakmrjqzamz3whf7xnb0vx9p29n9";
+      rev = "5cef0e6b607d3acb742d1de07a4ddd3a5bfa3036";
+      sha256 = "0mh8zjaw369djffi1vzy124pwnrcxg4pbyjnhy3pq2j6k579znc2";
     };
     dependencies = [];
 
@@ -474,11 +463,11 @@ rec {
   };
 
   vim-closetag = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-closetag-2017-07-04";
+    name = "vim-closetag-2017-07-24";
     src = fetchgit {
       url = "https://github.com/alvan/vim-closetag";
-      rev = "e15684e10eb456399fc496467cc9ece1e18a7ec8";
-      sha256 = "1rs1dlnn5syxny3qrgggyz8rc6anr8gkhkn19i72nmrvcbb40w0k";
+      rev = "2cacc501df30586c0f96f40f24d1a1239529198c";
+      sha256 = "00fayl6bnrf8b80xk73r1009z6hpzfc2jaih042hmnybx8k70byg";
     };
     dependencies = [];
 
@@ -496,11 +485,11 @@ rec {
   };
 
   clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "clighter8-2017-07-08";
+    name = "clighter8-2017-07-23";
     src = fetchgit {
       url = "https://github.com/bbchung/clighter8";
-      rev = "83ebf9e3961fcf1a4ccc557ab5f8c55cb813bc3b";
-      sha256 = "0rv16fbg0ga5csk9p2zczh100i55j1h70s0rcvdbgzfmbbmgsda7";
+      rev = "a75644681c3a25f9441c482fd0b1c983d12da7e1";
+      sha256 = "0hl14l8d0c0rwh7pv1d9bxkrvh1wjxdgjyi7cnhn75m7x9fd3ijh";
     };
     dependencies = [];
     preFixup = ''
@@ -510,11 +499,11 @@ rec {
   };
 
   neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neomake-2017-07-07";
+    name = "neomake-2017-07-25";
     src = fetchgit {
       url = "https://github.com/benekastah/neomake";
-      rev = "79c7dba684e3b179d7416d84fc86fac38f8190fe";
-      sha256 = "039b76n7d2nbbzrd83y4j8g103dvnrmk1pa84is5r5qv33hdpc0x";
+      rev = "0d1f1508ce2c9cfcffbf74a6bdea9c5766301fd6";
+      sha256 = "0wc9b63s4j80f6irf2g6dmk2nx8w9il4dccbgmzirchmymndw4vh";
     };
     dependencies = [];
 
@@ -554,11 +543,11 @@ rec {
   };
 
   vim-tmux-navigator = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-tmux-navigator-2017-06-20";
+    name = "vim-tmux-navigator-2017-07-07";
     src = fetchgit {
       url = "https://github.com/christoomey/vim-tmux-navigator";
-      rev = "3e83ddc509c66ac86b0c2961613076f74f34a2b6";
-      sha256 = "0zp81qkaahcl85s60cphqh7rsw3hpvnlr98p5lwzp5dsbxxh0iby";
+      rev = "d724094e7128acd7375cc758008f1e1688130877";
+      sha256 = "1n0n26lx056a0f8nmzbjpf8a48971g4d0fzv8xmq8yy505gbq9iw";
     };
     dependencies = [];
 
@@ -576,22 +565,22 @@ rec {
   };
 
   ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ctrlp-vim-2017-07-04";
+    name = "ctrlp-vim-2017-07-18";
     src = fetchgit {
       url = "https://github.com/ctrlpvim/ctrlp.vim";
-      rev = "b9b334b7ee07f03bbbc46193bb544124bd430148";
-      sha256 = "1pzhffbbmw45x6izdhyi7zp6wy2x2r93g6jz03fdj0qmja0wk1b4";
+      rev = "3a048e85d3c2f72b1564e2dc43ed5b1d67bd59a9";
+      sha256 = "10i2lwjizd74b3zi1ahinz2h8qbd18jzw93xrpw0iswrynfsprjv";
     };
     dependencies = [];
 
   };
 
   agda-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "agda-vim-2017-03-18";
+    name = "agda-vim-2017-07-18";
     src = fetchgit {
       url = "https://github.com/derekelkins/agda-vim";
-      rev = "7f00093e485f07aa1daafa71e85306397c059402";
-      sha256 = "1yc1lhzir440jmv5aivhvn3bgxncz7p0vydla6mrf14gw6fqbp12";
+      rev = "d82c5da78780e866e1afd8eecba1aa9c661c2aa8";
+      sha256 = "1aq7wyi1an6znql814w3v30p96yzyd5xnypblzxvsi62jahysfwa";
     };
     dependencies = [];
 
@@ -642,11 +631,11 @@ rec {
   };
 
   neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neco-ghc-2017-06-17";
+    name = "neco-ghc-2017-07-22";
     src = fetchgit {
       url = "https://github.com/eagletmt/neco-ghc";
-      rev = "ea515ae60a0523539fe75680f07aa2a588de9a99";
-      sha256 = "1pj5a5v3x8vnkck60kc25ph9b5xx0d8ipa4f4llxpc0q8d2xzk6w";
+      rev = "1c7bf1b544f295d066863b9f193de709aec5bbad";
+      sha256 = "1vbl75s0zvbw6zvs790yla06rl8akpamm0p98s5mbj7mdnivkqhb";
     };
     dependencies = [];
 
@@ -675,22 +664,22 @@ rec {
   };
 
   vim-elixir = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-elixir-2017-05-18";
+    name = "vim-elixir-2017-07-19";
     src = fetchgit {
       url = "https://github.com/elixir-lang/vim-elixir";
-      rev = "fe7daaaff030e217dffedf53cb5f426099281e3e";
-      sha256 = "09jqbymwf1m0c0wdsq93nryapzjw0fx0hwzzwxvwxygvnx3nvf22";
+      rev = "7c16ab889d12a32a7d15c54c36c0f47809b06e06";
+      sha256 = "0h9gqxqyl6p6ckknn8838wz71xz5v2jqkc2swjdkfbff2n9k1gwb";
     };
     dependencies = [];
 
   };
 
   elm-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "elm-vim-2017-02-27";
+    name = "elm-vim-2017-07-09";
     src = fetchgit {
       url = "https://github.com/elmcast/elm-vim";
-      rev = "b47d013d1fdfecc9e19df8034439b8e379813696";
-      sha256 = "0ibmb02qal7q29brmq0jkd3rcnwp6yba9agza3av1x1ixvb61mlw";
+      rev = "ae5315396cd0f3958750f10a5f3ad9d34d33f40d";
+      sha256 = "0a85l0mcxgha4s5c9lzdv9y2c1ff942y9a5sfjihz6sph21c77xp";
     };
     dependencies = [];
 
@@ -741,11 +730,11 @@ rec {
   };
 
   vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-go-2017-07-06";
+    name = "vim-go-2017-07-25";
     src = fetchgit {
       url = "https://github.com/fatih/vim-go";
-      rev = "f08fcab5c51bee18174340405b773a950446e9f5";
-      sha256 = "1hsfaca9mhp7829b6kl7bmrwm03kjjhz9grmjzgr7v3arlpcv9sa";
+      rev = "76cd99db6a88e825f361df0043cbff777c4a14fb";
+      sha256 = "1pda9dmaacnzwm92a7vsly053dq2c1bcsqx99rwr41mkpzsk649l";
     };
     dependencies = [];
 
@@ -763,22 +752,22 @@ rec {
   };
 
   floobits-neovim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "floobits-neovim-2017-02-08";
+    name = "floobits-neovim-2017-07-25";
     src = fetchgit {
       url = "https://github.com/floobits/floobits-neovim";
-      rev = "9755412fcd68cfc76a36aa000682a84d96013650";
-      sha256 = "1mn6kikygk86xblxg8kklkrrxagil4az76z0mzid847g4jw4hfd1";
+      rev = "5b83fc75e4241911649782fd5b87ac7da30e77bd";
+      sha256 = "05jrybkhg39v3z295l55aasb074wvm3pnyp7l38jqk7z4432gdc4";
     };
     dependencies = [];
 
   };
 
   psc-ide-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "psc-ide-vim-2017-07-05";
+    name = "psc-ide-vim-2017-07-14";
     src = fetchgit {
       url = "https://github.com/frigoeu/psc-ide-vim";
-      rev = "22813d6222766d773e77fadf36ee5eed4162ece4";
-      sha256 = "0261nkzj7412f55l6yxsr9xh2ynvnm5zb6ciasj809ynqapqvx2i";
+      rev = "0ff0c0a4e4087cb4444d0a19f2b2e436e723b186";
+      sha256 = "0kq8iqhv8flyc12m9ajmbrfk7k6zl3gnnxg5j8sw69aqy6pqvd0p";
     };
     dependencies = [];
 
@@ -829,11 +818,11 @@ rec {
   };
 
   calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "calendar-vim-2017-07-02";
+    name = "calendar-vim-2017-07-08";
     src = fetchgit {
       url = "https://github.com/itchyny/calendar.vim";
-      rev = "1b4bff01dbcf81e9415c4181e702762f2c4f5638";
-      sha256 = "0lsyy7xn460sawpki2svc29b2dm7n6vi0r22jm4djk7n5y9y4xj4";
+      rev = "6d6be26b2ad1870658525e2a42046429c845516c";
+      sha256 = "0g4k7vn3r8y0ss0nl6apxgpkdi7ixi87a9g5xr66n70lxyn7m9pz";
     };
     dependencies = [];
 
@@ -972,11 +961,11 @@ rec {
   };
 
   fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fzf-vim-2017-07-01";
+    name = "fzf-vim-2017-07-24";
     src = fetchgit {
       url = "https://github.com/junegunn/fzf.vim";
-      rev = "55f6bc83677235a7f6ffc35496ecae2e2a764417";
-      sha256 = "0yir125q9cgpk5b07ns9rg0s8f65g7jfka1jq9ir02w47090kgnb";
+      rev = "685f9aae97072a190a1230a5c79692e15b7f46c9";
+      sha256 = "1064qwypq8hl0dx65fhvx0aq4jp7hc60rzb0vy98zjr3sr4wshbh";
     };
     dependencies = [];
 
@@ -1049,22 +1038,22 @@ rec {
   };
 
   vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimtex-2017-07-06";
+    name = "vimtex-2017-07-25";
     src = fetchgit {
       url = "https://github.com/lervag/vimtex";
-      rev = "b31b49f0dca7c7acff9b7256315c3dc3bcedac98";
-      sha256 = "1qbhypswa2pa61ksyqp987q9413wvwkhj0avcbvli2n3hn8scz5f";
+      rev = "1bba731f008a0905c1cf34e185c3f299d1f1759b";
+      sha256 = "0gcsfdc2rrdaylsqz6hn9smchndb4y22f4sm230ljdf1rda6v57v";
     };
     dependencies = [];
 
   };
 
   vim-easymotion = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-easymotion-2017-04-27";
+    name = "vim-easymotion-2017-07-14";
     src = fetchgit {
       url = "https://github.com/lokaltog/vim-easymotion";
-      rev = "d55e7bf515eab93e0b49f6f762bf5b0bf808264d";
-      sha256 = "1dqx8nrw8jcpdnnqmca6yl1y0fdlc64rz9msbsmvp502v98wvhnh";
+      rev = "e4d71c7ba45baf860fdaaf8c06cd9faebdccbd50";
+      sha256 = "16ww4myvgh7is5fbwm67v87bbdyhldvr9d4vqkvnn8v9mbj7p7vd";
     };
     dependencies = [];
 
@@ -1129,6 +1118,28 @@ rec {
 
   };
 
+  forms = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "forms-2012-11-28";
+    src = fetchgit {
+      url = "https://github.com/megaannum/forms";
+      rev = "b601e03fe0a3b8a43766231f4a6217e4492b4f75";
+      sha256 = "19kp1i5c6jmnpbsap9giayqbzlv7vh02mp4mjvicqj9n0nfyay74";
+    };
+    dependencies = ["self"];
+
+  };
+
+  self = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "self-2014-05-28";
+    src = fetchgit {
+      url = "https://github.com/megaannum/self";
+      rev = "2ed666b547eddee6ae1fcc63babca4ba0b66a59f";
+      sha256 = "1gcwn6i5i3msg7hrlzsnv1bs6pm4jz9cff8ppaz2xdj8xv9qy6fn";
+    };
+    dependencies = [];
+
+  };
+
   vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-startify-2017-06-15";
     src = fetchgit {
@@ -1207,11 +1218,11 @@ rec {
   };
 
   haskell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "haskell-vim-2017-04-03";
+    name = "haskell-vim-2017-07-18";
     src = fetchgit {
       url = "https://github.com/neovimhaskell/haskell-vim";
-      rev = "9811f3803317c4f39c868e71b3202b5559735aef";
-      sha256 = "02f87lfpr5lslh57cqimg91llflra8934jzy0g32l5zcm7fdljdk";
+      rev = "21c48768f1c5986d4f2351784b119eb9a5f925db";
+      sha256 = "1dd18plhahkdz782d7y8w8265di2wvs78w2q2hx2m68686abmn0h";
     };
     dependencies = [];
 
@@ -1284,11 +1295,11 @@ rec {
   };
 
   vim-racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-racer-2017-05-20";
+    name = "vim-racer-2017-07-19";
     src = fetchgit {
       url = "https://github.com/racer-rust/vim-racer";
-      rev = "92c3e2b57e60c3d4f0102d1d587ddc762e662f60";
-      sha256 = "0wf74ilkkqjm6s3r329i9w2jgnh5kd2jkswan3bvqc5g14a2ddhl";
+      rev = "c729b895885c9ef548ed4f9c1cec7c7c741b5869";
+      sha256 = "1r0idhc7yj5r4h2rfmbb5p0i1yckr3mckif3ijy6sm9rhwi242sw";
     };
     dependencies = [];
 
@@ -1328,33 +1339,33 @@ rec {
   };
 
   rust-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "rust-vim-2017-06-01";
+    name = "rust-vim-2017-07-14";
     src = fetchgit {
       url = "https://github.com/rust-lang/rust.vim";
-      rev = "b77ac8ecbd4baaa23cca612e1c9b3df5ea23da9b";
-      sha256 = "07qkyils4dgl81lqifx0pr075m3mdpzifp1w5d0zw4zkpvb0v8nk";
+      rev = "5a6133680ecf9e22eeba35c35e62ea6210225b02";
+      sha256 = "0mxzl8lghq7bnwp8qs3haxq83ds5q8s8br0ajn40a3c3ns2hkhla";
     };
     dependencies = [];
 
   };
 
   neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neoformat-2017-07-06";
+    name = "neoformat-2017-07-22";
     src = fetchgit {
       url = "https://github.com/sbdchd/neoformat";
-      rev = "0a4904771ee0df76f01146bdcbac5dde4f5a61af";
-      sha256 = "09i4ngih8cd3613mhsz0bbpwppbwsx723k7xx9ha6ybnfrmhx1ra";
+      rev = "a0c8e1f3c8b917afd175fc9ed9b2685ce5f952e9";
+      sha256 = "1w2m54ag1g1czfwa8y2vq4p05wysvb1qhgfnbzqvlwb1mn9sh2kf";
     };
     dependencies = [];
 
   };
 
   deoplete-rust = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-rust-2017-06-28";
+    name = "deoplete-rust-2017-07-18";
     src = fetchgit {
       url = "https://github.com/sebastianmarkow/deoplete-rust";
-      rev = "505735576e29d30fee5074a9a49fdeb989c632b2";
-      sha256 = "0nqvk7f7asbfcfiv2lw3hinsaln648xc8k5jd630q0p4gyyxqpdm";
+      rev = "0a86e502113910c33448b337c4d50cabea120d25";
+      sha256 = "0wsck83jns40ny3740vwjhc8g5bh6zl71hkirbjxy6n4xgixa54h";
     };
     dependencies = [];
 
@@ -1372,22 +1383,22 @@ rec {
   };
 
   neco-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neco-vim-2017-04-25";
+    name = "neco-vim-2017-07-23";
     src = fetchgit {
       url = "https://github.com/shougo/neco-vim";
-      rev = "2329ad0a20af61ac104a29d3653e5af24add7077";
-      sha256 = "1mf7xdlarwj2kfx3pbngrvfrzmbjp6k5f6bxl4n1wz9p7wdajap8";
+      rev = "7c188577ebf65bfb9e27affce8158e0f5af2ec3e";
+      sha256 = "1jb9vw2gkag2fg18vxqj3rc6y4zqgrn0kf6vb5z8kgkbsam0cybk";
     };
     dependencies = [];
 
   };
 
   neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neocomplete-vim-2017-06-24";
+    name = "neocomplete-vim-2017-07-23";
     src = fetchgit {
       url = "https://github.com/shougo/neocomplete.vim";
-      rev = "186881fc40d9b774766a81189af17826d27406c2";
-      sha256 = "0x9fmvliwxm49q8970byaqrnrffcxjf29z0y7xsfi56sv277lpl5";
+      rev = "d8caad4fc14fc1be5272bf6ebc12048212d67d2c";
+      sha256 = "1ab1p4w6187r15alb34mnvaq43mikk7ic05ysgilx4f4zz6dgz5y";
     };
     dependencies = [];
 
@@ -1405,11 +1416,11 @@ rec {
   };
 
   neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-vim-2017-06-24";
+    name = "neosnippet-vim-2017-07-15";
     src = fetchgit {
       url = "https://github.com/shougo/neosnippet.vim";
-      rev = "867149c56651f0958bfde1f56e203f90afba134d";
-      sha256 = "19cwpans16ahmmnjfqxz5x3zw89qn93c9sc80sscw76i4ih4skml";
+      rev = "4bf88a9e497dc7180e9fe58551ad340de0192f39";
+      sha256 = "0mj14cninszfw95zb0rwcmzf40851i49lj6vk8gz4iq9y0hxsnx7";
     };
     dependencies = [];
 
@@ -1427,11 +1438,11 @@ rec {
   };
 
   vimproc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimproc-vim-2016-08-06";
+    name = "vimproc-vim-2017-07-22";
     src = fetchgit {
       url = "https://github.com/shougo/vimproc.vim";
-      rev = "25cb83f24edec4aec1e9f1329302235e7a7a7fe0";
-      sha256 = "19nl21623cv05j6ljyn35qm38pw3680nch2by1gapqmxazp99i20";
+      rev = "03a38f283ca9e15784e8fea84e8afc5d633b9639";
+      sha256 = "0ypffp724f3qp0mryxmmmi1ci0bnz34nnr7yi3c893pd9mpkrjjr";
     };
     dependencies = [];
     buildInputs = [ which ];
@@ -1467,11 +1478,11 @@ rec {
   };
 
   alchemist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "alchemist-vim-2017-04-21";
+    name = "alchemist-vim-2017-07-23";
     src = fetchgit {
       url = "https://github.com/slashmili/alchemist.vim";
-      rev = "12d9d8b9a8875d0edb75c3d91d4f8f04f3558fb7";
-      sha256 = "0xg1yixs8p4f2sghbh204p8b10m1zb3xxi4jwiqrrw4jhprh8g4f";
+      rev = "35b0e59b4ae45baeef7fc46b6faf9b96515d35cb";
+      sha256 = "021iwhnjjsfhmpbimm91jgmcrlj1hjh8rxcdqxwcwxc92h73wl58";
     };
     dependencies = [];
 
@@ -1533,11 +1544,11 @@ rec {
   };
 
   vim-dispatch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-dispatch-2017-06-23";
+    name = "vim-dispatch-2017-07-12";
     src = fetchgit {
       url = "https://github.com/tpope/vim-dispatch";
-      rev = "ca10dc106a5a3684573a3841560b167f4b86fde1";
-      sha256 = "1ad98k08i5zcyggjxcxygr4j513fg43di99gqg1jbi8xvyhgha69";
+      rev = "14a1695f844a320dd28a7706710325773d1046a8";
+      sha256 = "1whmqikg5ch523ffs2apkrd4clwl7s0y98gmxgaqq6gm2fa2wmfp";
     };
     dependencies = [];
 
@@ -1599,11 +1610,11 @@ rec {
   };
 
   youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "youcompleteme-2017-07-07";
+    name = "youcompleteme-2017-07-24";
     src = fetchgit {
       url = "https://github.com/valloric/youcompleteme";
-      rev = "d299f9eb708ec83713f904dbb49c4260b6b22240";
-      sha256 = "0g2spq5c9sps0zql8pg0xbnxbcqn0aacy96jd1ixxh6dg9gijkp0";
+      rev = "998303e2fd5e762c3bc2aee8c23af1b388fb459c";
+      sha256 = "158wnxgnjir4n5p1jnpxqq4qwl6hapd9kpdd3gklihxvbj1zqskc";
     };
     dependencies = [];
     buildPhase = ''
@@ -1625,11 +1636,11 @@ rec {
   };
 
   vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-themes-2017-06-24";
+    name = "vim-airline-themes-2017-07-10";
     src = fetchgit {
       url = "https://github.com/vim-airline/vim-airline-themes";
-      rev = "7865fd8ba435edd01ff7b59de06a9be73e01950d";
-      sha256 = "0fd4s8y6w5flbrikislcvj2a0jb77rd6gwg207qskxfqncxsbswn";
+      rev = "5d75d76ca2e17edd68f89ac4f547009d477570c6";
+      sha256 = "15vq8fjax69wi447vhirj7vzqxppxcpvq2v8dhi0pf39gbzcd229";
     };
     dependencies = [];
 
@@ -1778,6 +1789,17 @@ rec {
 
   };
 
+  ale = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "ale-2017-07-23";
+    src = fetchgit {
+      url = "https://github.com/w0rp/ale";
+      rev = "a0059cfe0362e8ba55bad1f4fa8a310c74b55280";
+      sha256 = "0hjli8ww0i4yxa7gxiyvy9xgc9s8krr7vhdh8036nwwnrzrmcc5h";
+    };
+    dependencies = [];
+
+  };
+
   vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-wakatime-2017-07-03";
     src = fetchgit {
@@ -1846,7 +1868,7 @@ rec {
       sha256 = "1ixav3d78wy9zs9a8hg8yqk812srkbkwsaz17lg5sxjq6azljgvq";
     };
     dependencies = [];
-    buildInputs = [ python3 ]; 
+    buildInputs = [ python3 ];
     buildPhase = ''
       pushd ./rplugin/python3/deoplete/ujson
       python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build
@@ -1856,11 +1878,11 @@ rec {
   };
 
   deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-jedi-2017-06-11";
+    name = "deoplete-jedi-2017-07-16";
     src = fetchgit {
       url = "https://github.com/zchee/deoplete-jedi";
-      rev = "b7e789ef8b45b207650adb1af5e2e7f188053fe1";
-      sha256 = "0xv7ggwyl332yr93rqmf1li0zz8rzhgb10cvd78jssdvlazi3mc8";
+      rev = "56528fd1238bbf2f9363f16710d0936703dc9eab";
+      sha256 = "1kwwbr1w3865rlqs04hpxrqv67a14mzyf85pa29djmryi2156wxb";
     };
     dependencies = [];
 
@@ -1943,17 +1965,6 @@ rec {
 
   };
 
-  self = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "self-2014-05-28";
-    src = fetchgit {
-      url = "git://github.com/megaannum/self";
-      rev = "2ed666b547eddee6ae1fcc63babca4ba0b66a59f";
-      sha256 = "1gcwn6i5i3msg7hrlzsnv1bs6pm4jz9cff8ppaz2xdj8xv9qy6fn";
-    };
-    dependencies = [];
-
-  };
-
   sensible = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "sensible-2017-05-09";
     src = fetchgit {
@@ -1966,11 +1977,11 @@ rec {
   };
 
   sleuth = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "sleuth-2017-05-28";
+    name = "sleuth-2017-07-23";
     src = fetchgit {
       url = "git://github.com/tpope/vim-sleuth";
-      rev = "fc5cf44466d50fada784530de933af80c6448db5";
-      sha256 = "10l6ins66g1wxwzgjcpwim0295yz9ni282f8n7vjafd5v486fxnw";
+      rev = "dfe0a33253c61dd8fac455baea4ec492e6cf0fe3";
+      sha256 = "0576k4l2wbzy9frvv268vdix4k6iz9pw6n6626ifvg8hk6gbc5g9";
     };
     dependencies = [];
 
@@ -2273,11 +2284,11 @@ rec {
   };
 
   vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-2017-07-07";
+    name = "vim-airline-2017-07-21";
     src = fetchgit {
       url = "git://github.com/vim-airline/vim-airline";
-      rev = "e03afa1733c6296774ca95ef981bd8fd39bb1151";
-      sha256 = "0n8l4al4hicnz1xyhcbyb6iw3fxrjslmxk18zanyqcamhfj94vy3";
+      rev = "72e5f04f7c422e21cb6f6856c4e94cef25ea2288";
+      sha256 = "0pkdlmil0lqwwi7anzn7r1zxxqbip9zy1pbwri031yksff6v2096";
     };
     dependencies = [];
 
@@ -2339,11 +2350,11 @@ rec {
   };
 
   vim-latex-live-preview = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-latex-live-preview-2017-06-22";
+    name = "vim-latex-live-preview-2017-07-19";
     src = fetchgit {
       url = "git://github.com/xuhdev/vim-latex-live-preview";
-      rev = "becc9d4f1a774e6deb7a96015200de35f1bec1a3";
-      sha256 = "0mqvzk94byiccm7v8kdk0hcbz05k9l69kv3ljg8djbvj5q6zzi2m";
+      rev = "172b03cd0677f1fe55abeab86fa4a4c484e4c3b5";
+      sha256 = "1wgnq1kbx80xqwm9rx3z4i9fldj965046s4hh62rdi5585hh6aps";
     };
     dependencies = [];
 
@@ -2372,11 +2383,11 @@ rec {
   };
 
   vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signify-2017-06-06";
+    name = "vim-signify-2017-07-19";
     src = fetchgit {
       url = "git://github.com/mhinz/vim-signify";
-      rev = "d9918a69bcff382569ddf5bda030aff412bfd790";
-      sha256 = "1kc7q8xsvg0hl9b3z5a6phfndx7a5pcfy1d3q7i02aaa8dw4ga7j";
+      rev = "748cb0ddab1b7e64bb81165c733a7b752b3d36e4";
+      sha256 = "0kc4nbf3a7ab0an4r1j37bvzjarr4135qqhkz348r7zdhmqkyyfm";
     };
     dependencies = [];
 
@@ -2416,11 +2427,11 @@ rec {
   };
 
   vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimwiki-2017-04-15";
+    name = "vimwiki-2017-07-15";
     src = fetchgit {
       url = "git://github.com/vimwiki/vimwiki";
-      rev = "8cdc1c15388cc7f4edb827ff15dbc31d592a79af";
-      sha256 = "0hzmssyz7y7hv3mv67zkqwxc13crkpwv0plm7z701943h2zxj08h";
+      rev = "976cbbcd23dcd19ddb5dc5544645da8a51dbdfe6";
+      sha256 = "1mna3qavwj1jcjnvmw8hngrfccpk5krj2z0v2grp97i9m2kmkifx";
     };
     dependencies = [];
 
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index da5c1d62a2f..10630636b89 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -1,7 +1,6 @@
 "CSApprox"
 "CheckAttach"
 "Gist"
-"gruvbox"
 "Hoogle"
 "Solarized"
 "Supertab"
@@ -16,8 +15,8 @@
 "YankRing"
 "clang_complete"
 "commentary"
-"ctrlp-py-matcher"
 "ctrlp-cmatcher"
+"ctrlp-py-matcher"
 "ctrlp-z"
 "extradite"
 "fugitive"
@@ -27,8 +26,8 @@
 "github:LnL7/vim-nix"
 "github:Quramy/tsuquyomi"
 "github:Shougo/deoplete.nvim"
-"github:albfan/nerdtree-git-plugin"
 "github:ajh17/Spacegray.vim"
+"github:albfan/nerdtree-git-plugin"
 "github:alvan/vim-closetag"
 "github:ap/vim-css-color"
 "github:bbchung/clighter8"
@@ -45,6 +44,7 @@
 "github:dleonard0/pony-vim-syntax"
 "github:dracula/vim"
 "github:eagletmt/neco-ghc"
+"github:editorconfig/editorconfig-vim"
 "github:eikenb/acp"
 "github:elixir-lang/vim-elixir"
 "github:elmcast/elm-vim"
@@ -57,6 +57,7 @@
 "github:floobits/floobits-neovim"
 "github:frigoeu/psc-ide-vim"
 "github:google/vim-jsonnet"
+"github:heavenshell/vim-jsdoc"
 "github:hecal3/vim-leader-guide"
 "github:idris-hackers/idris-vim"
 "github:itchyny/calendar.vim"
@@ -67,6 +68,7 @@
 "github:jceb/vim-orgmode"
 "github:jeetsukumaran/vim-buffergator"
 "github:jgdavey/tslime.vim"
+"github:jiangmiao/auto-pairs"
 "github:jistr/vim-nerdtree-tabs"
 "github:jnurmine/zenburn"
 "github:jonbri/vim-colorstepper"
@@ -85,6 +87,8 @@
 "github:lyokha/vim-xkbswitch"
 "github:machakann/vim-highlightedyank"
 "github:martinda/Jenkinsfile-vim-syntax"
+"github:megaannum/forms"
+"github:megaannum/self"
 "github:mhinz/vim-startify"
 "github:michaeljsmith/vim-indent-object"
 "github:mileszs/ack.vim"
@@ -93,6 +97,7 @@
 "github:nathanaelkane/vim-indent-guides"
 "github:nbouscal/vim-stylish-haskell"
 "github:neovimhaskell/haskell-vim"
+"github:nixprime/cpsm"
 "github:osyo-manga/shabadou.vim"
 "github:osyo-manga/vim-watchdogs"
 "github:plasticboy/vim-markdown"
@@ -102,8 +107,8 @@
 "github:rhysd/vim-grammarous"
 "github:rodjek/vim-puppet"
 "github:rust-lang/rust.vim"
-"github:sebastianmarkow/deoplete-rust"
 "github:sbdchd/neoformat"
+"github:sebastianmarkow/deoplete-rust"
 "github:sheerun/vim-polyglot"
 "github:shougo/neco-vim"
 "github:shougo/neocomplete.vim"
@@ -134,20 +139,22 @@
 "github:vim-scripts/Rename"
 "github:vim-scripts/ReplaceWithRegister"
 "github:vim-scripts/a.vim"
-"github:vim-scripts/argtextobj.vim"
 "github:vim-scripts/align"
+"github:vim-scripts/argtextobj.vim"
 "github:vim-scripts/changeColorScheme.vim"
 "github:vim-scripts/random.vim"
 "github:vim-scripts/tabmerge"
 "github:vim-scripts/wombat256.vim"
+"github:w0rp/ale"
 "github:wakatime/vim-wakatime"
 "github:wincent/command-t"
 "github:xolox/vim-easytags"
 "github:xolox/vim-misc"
 "github:zah/nim.vim"
-"github:zchee/deoplete-jedi"
 "github:zchee/deoplete-go"
+"github:zchee/deoplete-jedi"
 "goyo"
+"gruvbox"
 "matchit.zip"
 "pathogen"
 "quickfixstatus"
@@ -196,7 +203,3 @@
 "vimwiki"
 "vinegar"
 "vundle"
-"github:jiangmiao/auto-pairs"
-"github:editorconfig/editorconfig-vim"
-"github:heavenshell/vim-jsdoc"
-"github:nixprime/cpsm"
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t
index 57aa35999dc..5c96e11de7a 100644
--- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t
+++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t
@@ -1,6 +1,6 @@
-    buildInputs = [ perl ruby ];
+    buildInputs = [ perl ruby git ];
     buildPhase = ''
       pushd ruby/command-t
-      gem build command-t.gemspec
+      gem build ./command-t.gemspec
       popd
     '';
diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix
index 46b5fcb0bf9..4ffd8fadd12 100644
--- a/pkgs/os-specific/linux/cryptodev/default.nix
+++ b/pkgs/os-specific/linux/cryptodev/default.nix
@@ -1,25 +1,27 @@
 { fetchurl, stdenv, kernel, onlyHeaders ? false }:
 
 stdenv.mkDerivation rec {
-  pname = "cryptodev-linux-1.8";
+  pname = "cryptodev-linux-1.9";
   name = "${pname}-${kernel.version}";
 
   src = fetchurl {
-    url = "http://download.gna.org/cryptodev-linux/${pname}.tar.gz";
-    sha256 = "0xhkhcdlds9aiz0hams93dv0zkgcn2abaiagdjlqdck7zglvvyk7";
+    urls = [
+      "http://nwl.cc/pub/cryptodev-linux/${pname}.tar.gz"
+      "http://download.gna.org/cryptodev-linux/${pname}.tar.gz"
+    ];
+    sha256 = "0l3r8s71vkd0s2h01r7fhqnc3j8cqw4msibrdxvps9hfnd4hnk4z";
   };
 
   hardeningDisable = [ "pic" ];
 
   KERNEL_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
   INSTALL_MOD_PATH = "\${out}";
-  PREFIX = "\${out}";
+  prefix = "\${out}";
 
   meta = {
     description = "Device that allows access to Linux kernel cryptographic drivers";
     homepage = http://home.gna.org/cryptodev-linux/;
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.linux;
-    broken = !stdenv.lib.versionOlder kernel.version "4.9";
   };
 }
diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix
index cd561df0ec4..47dc42fed5e 100644
--- a/pkgs/os-specific/linux/dpdk/default.nix
+++ b/pkgs/os-specific/linux/dpdk/default.nix
@@ -4,11 +4,11 @@ assert lib.versionAtLeast kernel.version "3.18";
 
 stdenv.mkDerivation rec {
   name = "dpdk-${version}-${kernel.version}";
-  version = "16.07.2";
+  version = "17.05.1";
 
   src = fetchurl {
     url = "http://fast.dpdk.org/rel/dpdk-${version}.tar.xz";
-    sha256 = "1mzwazmzpq8mvwiham80y6h53qpvjpp76v0d58gz9bfiphbi9876";
+    sha256 = "1w3nx5cqf8z600bdlbwz7brmdb5yn233qrqvv24kbmmxhbwp7qld";
   };
 
   buildInputs = [ pkgconfig libvirt ];
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     install -m 0755 -d $out/${RTE_TARGET}/include
     install -m 0644 ${RTE_TARGET}/include/rte_config.h $out/${RTE_TARGET}/include
 
-    cp -pr mk scripts $out/
+    cp -pr mk $out/
 
     mkdir -p $kmod/lib/modules/${kernel.modDirVersion}/kernel/drivers/net
     cp ${RTE_TARGET}/kmod/*.ko $kmod/lib/modules/${kernel.modDirVersion}/kernel/drivers/net
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index c7a4ca30a7c..64b91cc677d 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.13-rc1";
-  modDirVersion = "4.13.0-rc1";
+  version = "4.13-rc2";
+  modDirVersion = "4.13.0-rc2";
   extraMeta.branch = "4.13";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "1pdbykp2336vk7ynrz0l95rwqags6kklbr08wjc7zpmdaad6yd6m";
+    sha256 = "1ni0z3v8zkqlmxn4czbw71yaipp6hbyh39vxdzpqy1dqn7zalmif";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/perf-binutils-path.patch b/pkgs/os-specific/linux/kernel/perf-binutils-path.patch
deleted file mode 100644
index d20f2296ea3..00000000000
--- a/pkgs/os-specific/linux/kernel/perf-binutils-path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru -x '*~' linux-4.9.31-orig/tools/perf/util/annotate.c linux-4.9.31/tools/perf/util/annotate.c
---- linux-4.9.31-orig/tools/perf/util/annotate.c	2017-06-07 12:08:04.000000000 +0200
-+++ linux-4.9.31/tools/perf/util/annotate.c	2017-06-12 13:10:08.811079574 +0200
-@@ -1350,7 +1350,7 @@
- 		 "%s %s%s --start-address=0x%016" PRIx64
- 		 " --stop-address=0x%016" PRIx64
- 		 " -l -d %s %s -C %s 2>/dev/null|grep -v %s|expand",
--		 objdump_path ? objdump_path : "objdump",
-+		 objdump_path ? objdump_path : OBJDUMP_PATH,
- 		 disassembler_style ? "-M " : "",
- 		 disassembler_style ? disassembler_style : "",
- 		 map__rip_2objdump(map, sym->start),
diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix
index 3fbad924568..b6f1f7d9f8a 100644
--- a/pkgs/os-specific/linux/kernel/perf.nix
+++ b/pkgs/os-specific/linux/kernel/perf.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, kernel, elfutils, python, perl, newt, slang, asciidoc, xmlto
+{ lib, stdenv, kernel, elfutils, python, perl, newt, slang, asciidoc, xmlto, makeWrapper
 , docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkgconfig, libunwind, binutils
 , libiberty, libaudit
 , zlib, withGtk ? false, gtk2 ? null }:
@@ -13,8 +13,6 @@ stdenv.mkDerivation {
 
   inherit (kernel) src;
 
-  patches = kernel.patches ++ [ ./perf-binutils-path.patch ];
-
   preConfigure = ''
     cd tools/perf
     sed -i s,/usr/include/elfutils,$elfutils/include/elfutils, Makefile
@@ -26,7 +24,7 @@ stdenv.mkDerivation {
   # perf refers both to newt and slang
   # binutils is required for libbfd.
   nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt
-      flex bison libiberty libaudit ];
+      flex bison libiberty libaudit makeWrapper ];
   buildInputs = [ elfutils python perl newt slang pkgconfig libunwind binutils zlib ] ++
     stdenv.lib.optional withGtk gtk2;
 
@@ -45,6 +43,11 @@ stdenv.mkDerivation {
 
   installFlags = "install install-man ASCIIDOC8=1";
 
+  preFixup = ''
+    wrapProgram $out/bin/perf \
+      --prefix PATH : "${binutils}/bin"
+  '';
+
   crossAttrs = {
     /* I don't want cross-python or cross-perl -
        I don't know if cross-python even works */
diff --git a/pkgs/servers/monitoring/lcdproc/default.nix b/pkgs/servers/monitoring/lcdproc/default.nix
new file mode 100644
index 00000000000..027e1090157
--- /dev/null
+++ b/pkgs/servers/monitoring/lcdproc/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, makeWrapper, pkgconfig
+, doxygen, freetype, libX11, libftdi, libftdi1, libusb, libusb1, ncurses, perl }:
+
+stdenv.mkDerivation rec {
+  name = "lcdproc-${version}";
+  version = "0.5.9";
+
+  src = fetchFromGitHub {
+    owner  = "lcdproc";
+    repo   = "lcdproc";
+    rev    = "v${version}";
+    sha256 = "1r885zv1gsh88j43x6fvzbdgfkh712a227d369h4fdcbnnfd0kpm";
+  };
+
+  patches = [
+    ./hardcode_mtab.patch
+  ];
+
+  configureFlags = [
+    "--enable-lcdproc-menus"
+    "--enable-drivers=all"
+    "--with-pidfile-dir=/run"
+  ];
+
+  buildInputs = [ freetype libX11 libftdi libusb libusb1 ncurses ];
+  nativeBuildInputs = [ autoreconfHook doxygen makeWrapper pkgconfig ];
+  enableParallelBuilding = true;
+
+  postFixup = ''
+    for f in $out/bin/*.pl ; do
+      substituteInPlace $f \
+        --replace /usr/bin/perl ${stdenv.lib.getBin perl}/bin/perl
+    done
+
+    # NixOS will not use this file anyway but at least we can now execute LCDd
+    substituteInPlace $out/etc/LCDd.conf \
+      --replace server/drivers/ $out/lib/lcdproc/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Client/server suite for controlling a wide variety of LCD devices";
+    homepage    = http://lcdproc.org/;
+    license     = licenses.gpl2;
+    maintainers = with maintainers; [ peterhoeg ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/servers/monitoring/lcdproc/hardcode_mtab.patch b/pkgs/servers/monitoring/lcdproc/hardcode_mtab.patch
new file mode 100644
index 00000000000..33c4b8e83b2
--- /dev/null
+++ b/pkgs/servers/monitoring/lcdproc/hardcode_mtab.patch
@@ -0,0 +1,17 @@
+diff --git a/clients/lcdproc/machine_Linux.c b/clients/lcdproc/machine_Linux.c
+index 7bb7266..a629674 100644
+--- a/clients/lcdproc/machine_Linux.c
++++ b/clients/lcdproc/machine_Linux.c
+@@ -259,11 +259,7 @@ machine_get_fs(mounts_type fs[], int *cnt)
+	char line[256];
+	int x = 0, err;
+
+-#ifdef MTAB_FILE
+-	mtab_fd = fopen(MTAB_FILE, "r");
+-#else
+-#error "Can't find your mounted filesystem table file."
+-#endif
++	mtab_fd = fopen("/etc/mtab", "r");
+
+	/* Get rid of old, unmounted filesystems... */
+	memset(fs, 0, sizeof(mounts_type) * 256);
diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh
index 686cb778ca7..42e1a029e58 100644
--- a/pkgs/stdenv/generic/builder.sh
+++ b/pkgs/stdenv/generic/builder.sh
@@ -1,3 +1,4 @@
+export PATH=
 for i in $initialPath; do
     if [ "$i" = / ]; then i=; fi
     PATH=$PATH${PATH:+:}$i/bin
diff --git a/pkgs/tools/X11/setroot/default.nix b/pkgs/tools/X11/setroot/default.nix
index 81b888ccb78..2245f03ec7f 100644
--- a/pkgs/tools/X11/setroot/default.nix
+++ b/pkgs/tools/X11/setroot/default.nix
@@ -5,14 +5,14 @@
 assert enableXinerama -> libXinerama != null;
 
 stdenv.mkDerivation rec {
-  version = "1.4.4";
+  version = "2.0.1";
   name = "setroot-${version}";
 
   src = fetchFromGitHub {
     owner = "ttzhou";
     repo = "setroot";
     rev = "v${version}";
-    sha256 = "0vphma0as8pnqrakdw6gaiiz7xawb4y72sc9dna755kkclgbyl8m";
+    sha256 = "01krjfc3xpp0wbqz9nvf1n34gkpd41gysn289sj1wcjxia4n4gsi";
   };
 
   buildInputs = [ libX11 imlib2 ]
@@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
     description = "Simple X background setter inspired by imlibsetroot and feh";
     homepage = https://github.com/ttzhou/setroot;
     license = licenses.gpl3Plus;
+    maintainers = maintainers.vyp;
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix
index 476c42504a2..dcea9c9435b 100644
--- a/pkgs/tools/backup/borg/default.nix
+++ b/pkgs/tools/backup/borg/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   name = "borgbackup-${version}";
-  version = "1.0.10";
+  version = "1.0.11";
   namePrefix = "";
 
   src = fetchurl {
     url = "https://github.com/borgbackup/borg/releases/download/"
       + "${version}/${name}.tar.gz";
-    sha256 = "1sarmpzwr8dhbg0hsvaclcsjfax36ssb32d9klhhah4j8kqji3wp";
+    sha256 = "14fjk5dfwmjkn7nmkbhhbrk3g1wfrn8arvqd5r9jaij534nzsvpw";
   };
 
   nativeBuildInputs = with python3Packages; [
diff --git a/pkgs/tools/backup/znapzend/default.nix b/pkgs/tools/backup/znapzend/default.nix
index 311df908689..cacfb8287a3 100644
--- a/pkgs/tools/backup/znapzend/default.nix
+++ b/pkgs/tools/backup/znapzend/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, zfs, mbuffer, perl, perlPackages, wget, autoconf, automake }:
 
 let
-  version = "0.15.7";
-  checksum = "1xb94kxfq9sm3g0s6wpyyz6h2aihgca5gyybg0a5r8sar7yz97j0";
+  version = "0.17.0";
+  checksum = "0cncwkiw0w2am7gwi01p6ln87zgg1x6blfyxx7n7x8m1mv6704hl";
 in
 stdenv.mkDerivation rec {
   name = "znapzend-${version}";
diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix
index 82ead0baa16..fb9301bf1ce 100644
--- a/pkgs/tools/compression/zstd/default.nix
+++ b/pkgs/tools/compression/zstd/default.nix
@@ -3,10 +3,10 @@
 
 stdenv.mkDerivation rec {
   name = "zstd-${version}";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
-    sha256 = "01b5w4yrwa8lgnjyi42zxjhw8cfyh8yfhdsjr04y5qsblz0hv0zl";
+    sha256 = "1rnxfhcmg8zsagyf70hiwm32mam60hq58pzgy7jn8c3iwv24mpz5";
     rev = "v${version}";
     repo = "zstd";
     owner = "facebook";
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index e4c8b0f33bc..0af97dd3b54 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -4,7 +4,7 @@
 
 # Optional Dependencies
 , snappy ? null, leveldb ? null, yasm ? null, fcgi ? null, expat ? null
-, curl ? null, fuse ? null, accelio ? null, libibverbs ? null, librdmacm ? null
+, curl ? null, fuse ? null, libibverbs ? null, librdmacm ? null
 , libedit ? null, libatomic_ops ? null, kinetic-cpp-client ? null
 , rocksdb ? null, libs3 ? null
 
@@ -50,7 +50,6 @@ let
   optExpat = shouldUsePkg expat;
   optCurl = shouldUsePkg curl;
   optFuse = shouldUsePkg fuse;
-  optAccelio = shouldUsePkg accelio;
   optLibibverbs = shouldUsePkg libibverbs;
   optLibrdmacm = shouldUsePkg librdmacm;
   optLibedit = shouldUsePkg libedit;
@@ -76,10 +75,6 @@ let
   hasOsd = hasServer;
   hasRadosgw = optFcgi != null && optExpat != null && optCurl != null && optLibedit != null;
 
-  hasXio = (stdenv.isLinux || stdenv.isFreeBSD) &&
-    versionAtLeast version "9.0.3" &&
-    optAccelio != null && optLibibverbs != null && optLibrdmacm != null;
-
   hasRocksdb = versionAtLeast version "9.0.0" && optRocksdb != null;
 
   # TODO: Reenable when kinetic support is fixed
@@ -128,8 +123,6 @@ stdenv.mkDerivation {
     optSnappy optLeveldb
   ] ++ optionals hasRadosgw [
     optFcgi optExpat optCurl optFuse optLibedit
-  ] ++ optionals hasXio [
-    optAccelio optLibibverbs optLibrdmacm
   ] ++ optionals hasRocksdb [
     optRocksdb
   ] ++ optionals hasKinetic [
@@ -192,7 +185,6 @@ stdenv.mkDerivation {
     (mkWith   (malloc == optGperftools)    "tcmalloc"             null)
     (mkEnable false                        "pgrefdebugging"       null)
     (mkEnable false                        "cephfs-java"          null)
-    (mkEnable hasXio                       "xio"                  null)
     (mkWith   (optLibatomic_ops != null)   "libatomic-ops"        null)
     (mkWith   true                         "ocf"                  null)
     (mkWith   hasKinetic                   "kinetic"              null)
diff --git a/pkgs/tools/misc/crudini/default.nix b/pkgs/tools/misc/crudini/default.nix
index 856138f046a..7ca103062c1 100644
--- a/pkgs/tools/misc/crudini/default.nix
+++ b/pkgs/tools/misc/crudini/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python2Packages }:
+{ stdenv, fetchFromGitHub, python2Packages, help2man }:
 
 python2Packages.buildPythonApplication rec {
   name = "crudini-${version}";
@@ -11,10 +11,30 @@ python2Packages.buildPythonApplication rec {
     sha256 = "0x9z9lsygripj88gadag398pc9zky23m16wmh8vbgw7ld1nhkiav";
   };
 
+  nativeBuildInputs = [ help2man ];
   propagatedBuildInputs = with python2Packages; [ iniparse ];
 
-  checkPhase = ''
+  doCheck = true;
+
+  prePatch = ''
+    # make runs the unpatched version in src so we need to patch them in addition to tests
     patchShebangs .
+  '';
+
+  postBuild = ''
+    make all
+  '';
+
+  postInstall = ''
+    mkdir -p $out/share/{man/man1,doc/crudini}
+
+    cp README EXAMPLES $out/share/doc/crudini/
+    for f in *.1 ; do
+      gzip -c $f > $out/share/man/man1/$(basename $f).gz
+    done
+  '';
+
+  checkPhase = ''
     pushd tests >/dev/null
     ./test.sh
   '';
diff --git a/pkgs/tools/misc/dateutils/default.nix b/pkgs/tools/misc/dateutils/default.nix
index 40d729d063d..396d26a6cd1 100644
--- a/pkgs/tools/misc/dateutils/default.nix
+++ b/pkgs/tools/misc/dateutils/default.nix
@@ -4,10 +4,10 @@ stdenv.mkDerivation rec {
   version = "0.4.1";
   name = "dateutils-${version}";
 
-  src =fetchurl {
+  src = fetchurl {
     url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${name}.tar.xz";
     sha256 = "0y2jsmvilljbid14lzmk3kgvasn4h7hr6y3wwbr3lkgwfn4y9k3c";
- 	};
+  };
 
   meta = with stdenv.lib; {
     description = "A bunch of tools that revolve around fiddling with dates and times in the command line";
diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix
index b3aca778cd9..26c5a6b2139 100644
--- a/pkgs/tools/misc/ddccontrol/default.nix
+++ b/pkgs/tools/misc/ddccontrol/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   patches = [ ./automake.patch ];
 
-  hardeningDisable = [ "format" ];
+  hardeningDisable = [ "format" "bindnow" ];
 
   prePatch = ''
       newPath=$(echo "${ddccontrol-db}/share/ddccontrol-db" | sed "s/\\//\\\\\\//g")
diff --git a/pkgs/tools/misc/quota/default.nix b/pkgs/tools/misc/quota/default.nix
new file mode 100644
index 00000000000..9ba138bf0e9
--- /dev/null
+++ b/pkgs/tools/misc/quota/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, e2fsprogs, openldap, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  version = "4.03";
+  name = "quota-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/linuxquota/quota-${version}.tar.gz";
+    sha256 = "0jv7vhxhjp3gc4hwgmrhg448sbzzqib80gdas9nm0c5zwyd4sv4w";
+  };
+
+  outputs = [ "out" "dev" "doc" "man" ];
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ e2fsprogs openldap ];
+
+  meta = with stdenv.lib; {
+    description = "Tools to manage kernel-level quotas in Linux";
+    homepage = http://sourceforge.net/projects/linuxquota/;
+    license = licenses.gpl2; # With some files being BSD as an exception
+    platforms = platforms.linux;
+    maintainers = [ maintainers.dezgeg ];
+  };
+}
diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix
index f312f4770b5..a28614e2a26 100644
--- a/pkgs/tools/misc/xfstests/default.nix
+++ b/pkgs/tools/misc/xfstests/default.nix
@@ -1,17 +1,18 @@
-{ stdenv, acl, attr, autoreconfHook, bash, bc, coreutils, e2fsprogs, fetchgit, fio, gawk
-, lib, libaio, libcap, libuuid, libxfs, lvm2, openssl, perl, procps, psmisc, su
+{ stdenv, acl, attr, autoconf, automake, bash, bc, coreutils, e2fsprogs, fetchgit, fio, gawk
+, lib, libaio, libcap, libtool, libuuid, libxfs, lvm2, openssl, perl, procps, psmisc, quota, su
 , time, utillinux, which, writeScript, xfsprogs }:
 
 stdenv.mkDerivation {
-  name = "xfstests-2017-03-26";
+  name = "xfstests-2017-07-16";
 
   src = fetchgit {
     url = "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git";
-    rev = "7400c10e503fed20fe2d9f8b03b2157eba4ff3b8";
-    sha256 = "0m30mx8nv49ryijlkqffjmkw2g1xdxsrq868jh9crwh19055v7qp";
+    rev = "c3893c2dc623a07b1ace8e72ee4beb29f8bfae15";
+    sha256 = "1p42dakry4r2366hdgj4i1wcnjs4qk0bfmyr70r1n7s7ykvnvnrl";
   };
 
-  buildInputs = [ acl autoreconfHook attr gawk libaio libuuid libxfs openssl perl ];
+  nativeBuildInputs = [ autoconf automake libtool ];
+  buildInputs = [ acl attr gawk libaio libuuid libxfs openssl perl ];
 
   hardeningDisable = [ "format" ];
   enableParallelBuilding = true;
@@ -55,6 +56,8 @@ stdenv.mkDerivation {
     export MAKE=$(type -P make)
     export SED=$(type -P sed)
     export SORT=$(type -P sort)
+
+    make configure
   '';
 
   postInstall = ''
@@ -83,7 +86,7 @@ stdenv.mkDerivation {
       ln -s @out@/lib/xfstests/$f $f
     done
 
-    export PATH=${lib.makeBinPath [acl attr bc e2fsprogs fio gawk libcap lvm2 perl procps psmisc utillinux which xfsprogs]}:$PATH
+    export PATH=${lib.makeBinPath [acl attr bc e2fsprogs fio gawk libcap lvm2 perl procps psmisc quota utillinux which xfsprogs]}:$PATH
     exec ./check "$@"
   '';
 
diff --git a/pkgs/tools/misc/xxd/default.nix b/pkgs/tools/misc/xxd/default.nix
new file mode 100644
index 00000000000..a4cfd4321ba
--- /dev/null
+++ b/pkgs/tools/misc/xxd/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, vim }:
+
+stdenv.mkDerivation rec {
+  name = "xxd-${version}";
+  inherit (vim) version;
+  phases = [ "installPhase" ];
+  installPhase = ''
+    mkdir -p $out/{bin,share/man/man1}
+    install -m755 ${stdenv.lib.getBin vim}/bin/xxd $out/bin/xxd
+    install -m644 ${stdenv.lib.getBin vim}/share/man/man1/xxd.1.gz $out/share/man/man1/xxd.1.gz
+  '';
+  meta = with stdenv.lib; {
+    description = "Make a hexdump or do the reverse.";
+    inherit (vim.meta) homepage license maintainers platforms;
+  };
+}
diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix
index dda4452f644..332edce45cd 100644
--- a/pkgs/tools/networking/haproxy/default.nix
+++ b/pkgs/tools/networking/haproxy/default.nix
@@ -10,13 +10,13 @@ assert usePcre -> pcre != null;
 stdenv.mkDerivation rec {
   pname = "haproxy";
   majorVersion = "1.7";
-  minorVersion = "3";
+  minorVersion = "8";
   version = "${majorVersion}.${minorVersion}";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://www.haproxy.org/download/${majorVersion}/src/${name}.tar.gz";
-    sha256 = "ebb31550a5261091034f1b6ac7f4a8b9d79a8ce2a3ddcd7be5b5eb355c35ba65";
+    sha256 = "0hp1k957idaphhmw4m0x8cdzdw9ga1mzgsnk2m0as86xrqy1b47c";
   };
 
   buildInputs = [ openssl zlib ]
diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix
index f83ea004db6..aee5302405a 100644
--- a/pkgs/tools/networking/mailutils/default.nix
+++ b/pkgs/tools/networking/mailutils/default.nix
@@ -1,36 +1,81 @@
-{ fetchurl, stdenv, gettext, gdbm, libtool, pam, readline
-, ncurses, gnutls, sasl, fribidi, gss , mysql, guile, texinfo,
-  gnum4, dejagnu, nettools }:
+{ stdenv, fetchurl, fetchpatch, autoreconfHook, dejagnu, gettext, libtool, pkgconfig
+, gdbm, pam, readline, ncurses, gnutls, guile, texinfo, gnum4, sasl, fribidi, nettools
+, gss, mysql }:
 
+let
+  p = "https://raw.githubusercontent.com/gentoo/gentoo/9c921e89d51876fd876f250324893fd90c019326/net-mail/mailutils/files";
+in
 stdenv.mkDerivation rec {
-  name = "mailutils-2.2";
+  name = "${project}-${version}";
+  project = "mailutils";
+  version = "3.2";
 
   src = fetchurl {
-    url = "mirror://gnu/mailutils/${name}.tar.bz2";
-    sha256 = "0szbqa12zqzldqyw97lxqax3ja2adis83i7brdfsxmrfw68iaf65";
+    url = "mirror://gnu/${project}/${name}.tar.xz";
+    sha256 = "0zh7xn8yvnw9zkc7gi5290i34viwxp1rn0g1q9nyvmckkvk59lwn";
   };
 
-  hardeningDisable = [ "format" ];
+  nativeBuildInputs = [
+    autoreconfHook gettext libtool pkgconfig
+  ] ++ stdenv.lib.optional doCheck dejagnu;
+  buildInputs = [
+    gdbm pam readline ncurses gnutls guile texinfo gnum4 sasl fribidi nettools
+    gss mysql.lib
+  ];
 
-  patches = [ ./path-to-cat.patch ./no-gets.patch ./scm_c_string.patch ];
+  patches = [
+    (fetchpatch {
+      url = "https://git.savannah.gnu.org/cgit/mailutils.git/patch/?id=afbb33cf9ff";
+      excludes = [ "NEWS" ];
+      sha256 = "0yzkfx3j1zkkb43fhchjqphw4xznbclj39bjzjggv32gppy6d1db";
+    })
+    ./fix-build-mb-len-max.patch
+    ./fix-test-ali-awk.patch
+    ./path-to-cat.patch
+  ];
 
-  postPatch = ''
-    sed -i -e '/chown root:mail/d' \
-           -e 's/chmod [24]755/chmod 0755/' \
-      */Makefile{,.in,.am}
-  '';
+  doCheck = true;
+  enableParallelBuilding = true;
+  hardeningDisable = [ "format" ];
 
   configureFlags = [
+    "--with-gssapi"
     "--with-gsasl"
-    "--with-gssapi=${gss}"
+    "--with-mysql"
   ];
 
-  buildInputs =
-   [ gettext gdbm libtool pam readline ncurses
-     gnutls mysql.lib guile texinfo gnum4 sasl fribidi gss nettools ]
-   ++ stdenv.lib.optional doCheck dejagnu;
+  readmsg-tests = stdenv.lib.optionals doCheck [
+    (fetchurl { url = "${p}/hdr.at"; sha256 = "0phpkqyhs26chn63wjns6ydx9468ng3ssbjbfhcvza8h78jlsd98"; })
+    (fetchurl { url = "${p}/nohdr.at"; sha256 = "1vkbkfkbqj6ml62s1am8i286hxwnpsmbhbnq0i2i0j1i7iwkk4b7"; })
+    (fetchurl { url = "${p}/twomsg.at"; sha256 = "15m29rg2xxa17xhx6jp4s2vwa9d4khw8092vpygqbwlhw68alk9g"; })
+    (fetchurl { url = "${p}/weed.at"; sha256 = "1101xakhc99f5gb9cs3mmydn43ayli7b270pzbvh7f9rbvh0d0nh"; })
+  ];
 
-  doCheck = true;
+  postPatch = ''
+    sed -e '/AM_GNU_GETTEXT_VERSION/s/0.18/0.19/' -i configure.ac
+    sed -i -e '/chown root:mail/d' \
+           -e 's/chmod [24]755/chmod 0755/' \
+      */Makefile{.in,.am}
+  '';
+
+  preCheck = ''
+    # Add missing files.
+    cp ${builtins.toString readmsg-tests} readmsg/tests/
+    for f in hdr.at nohdr.at twomsg.at weed.at; do
+      mv readmsg/tests/*-$f readmsg/tests/$f
+    done
+    # Disable comsat tests that fail without tty in the sandbox.
+    tty -s || echo > comsat/tests/testsuite.at
+    # Disable lmtp tests that require root spool.
+    echo > maidag/tests/lmtp.at
+    # Disable mda tests that require /etc/passwd to contain root.
+    grep -qo '^root:' /etc/passwd || echo > maidag/tests/mda.at
+    # Provide libraries for mhn.
+    export LD_LIBRARY_PATH=$(pwd)/lib/.libs
+  '';
+  postCheck = ''
+    unset LD_LIBRARY_PATH
+  '';
 
   meta = with stdenv.lib; {
     description = "Rich and powerful protocol-independent mail framework";
@@ -60,7 +105,7 @@ stdenv.mkDerivation rec {
       gpl3Plus /* tools */
     ];
 
-    maintainers = with maintainers; [ vrthra ];
+    maintainers = with maintainers; [ orivej vrthra ];
 
     homepage = http://www.gnu.org/software/mailutils/;
 
diff --git a/pkgs/tools/networking/mailutils/fix-build-mb-len-max.patch b/pkgs/tools/networking/mailutils/fix-build-mb-len-max.patch
new file mode 100644
index 00000000000..b28dfc5d99c
--- /dev/null
+++ b/pkgs/tools/networking/mailutils/fix-build-mb-len-max.patch
@@ -0,0 +1,14 @@
+diff --git a/frm/frm.h b/frm/frm.h
+index 178b87d54..7931faada 100644
+--- a/frm/frm.h
++++ b/frm/frm.h
+@@ -34,6 +34,9 @@
+ #ifdef HAVE_ICONV_H
+ # include <iconv.h>
+ #endif
++#ifdef HAVE_LIMITS_H
++# include <limits.h>
++#endif
+ #ifndef MB_LEN_MAX
+ # define MB_LEN_MAX 4
+ #endif
diff --git a/pkgs/tools/networking/mailutils/fix-test-ali-awk.patch b/pkgs/tools/networking/mailutils/fix-test-ali-awk.patch
new file mode 100644
index 00000000000..3d301d530de
--- /dev/null
+++ b/pkgs/tools/networking/mailutils/fix-test-ali-awk.patch
@@ -0,0 +1,16 @@
+diff --git a/mh/tests/ali.at b/mh/tests/ali.at
+index 28c0e5451..c76cf9363 100644
+--- a/mh/tests/ali.at
++++ b/mh/tests/ali.at
+@@ -85,9 +85,9 @@ ali -a ./mh_aliases korzen | tr -d ' '
+ [expout])
+ 
+ MH_CHECK([ali: group id],[ali05 ali-group-id ali-gid],[
+-cat /etc/passwd | awk -F : '/^#/ { next } $4==0 { print $1 }' > expout
++cat /etc/passwd | awk -F : '/^#/ { next } $4==0 { print $1; exit }' > expout
+ test -s expout || AT_SKIP_TEST
+-name=`awk -F : '/^#/ { next } $3==0 { print $1 }' /etc/group < /dev/null`
++name=`awk -F : '/^#/ { next } $3==0 { print $1; exit }' /etc/group < /dev/null`
+ test -z "$name" && AT_SKIP_TEST
+ 
+ echo "korzen: +$name" > mh_aliases
diff --git a/pkgs/tools/networking/mailutils/no-gets.patch b/pkgs/tools/networking/mailutils/no-gets.patch
deleted file mode 100644
index d72fa3f056c..00000000000
--- a/pkgs/tools/networking/mailutils/no-gets.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/lib/stdio.in.h
-+++ b/lib/stdio.in.h
-@@ -138,8 +138,10 @@
- /* It is very rare that the developer ever has full control of stdin,
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
--#undef gets
-+#ifdef gets
-+# undef gets
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+#endif
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
diff --git a/pkgs/tools/networking/mailutils/path-to-cat.patch b/pkgs/tools/networking/mailutils/path-to-cat.patch
index a9ae7c5366d..698ee08f340 100644
--- a/pkgs/tools/networking/mailutils/path-to-cat.patch
+++ b/pkgs/tools/networking/mailutils/path-to-cat.patch
@@ -1,8 +1,47 @@
-Fix absolute path to `cat'.
-
---- mailutils-2.2/testsuite/lib/mailutils.exp	2010-09-10 13:39:58.000000000 +0200
-+++ mailutils-2.2/testsuite/lib/mailutils.exp	2010-09-10 13:40:00.000000000 +0200
-@@ -719,7 +719,7 @@ proc mu_test_file {args} {
+diff --git a/mh/show.c b/mh/show.c
+index a43afe10c..6985386ec 100644
+--- a/mh/show.c
++++ b/mh/show.c
+@@ -254,7 +254,7 @@ main (int argc, char **argv)
+   */
+ 
+   if (!use_showproc)
+-    showproc = "/bin/cat";
++    showproc = "cat";
+   else
+     showproc = mh_global_profile_get ("showproc", NULL);
+ 
+diff --git a/mh/tests/mhparam.at b/mh/tests/mhparam.at
+index 54b7fc06a..3abd5bf9b 100644
+--- a/mh/tests/mhparam.at
++++ b/mh/tests/mhparam.at
+@@ -28,7 +28,7 @@ mhparam -all | tr '\t' ' ' | sed 's/^Path:.*/Path: Mail/;s/^mhetcdir:.*/mhetcdir
+ [0],
+ [Path: Mail
+ mhetcdir: dir
+-moreproc: /bin/cat
++moreproc: cat
+ Sequence-Negation: not
+ Draft-Folder: Mail/drafts
+ Aliasfile: .mh_aliases
+diff --git a/mh/tests/testsuite.at b/mh/tests/testsuite.at
+index c6820843c..6675a4a9c 100644
+--- a/mh/tests/testsuite.at
++++ b/mh/tests/testsuite.at
+@@ -25,7 +25,7 @@ export MH
+ cat > $MH <<EOT
+ Path: $HOME/Mail
+ mhetcdir: $abs_top_srcdir/mh/etc
+-moreproc: /bin/cat
++moreproc: cat
+ EOT
+ MTSTAILOR=$HOME/mtstailor
+ export MTSTAILOR
+diff --git a/testsuite/lib/mailutils.exp b/testsuite/lib/mailutils.exp
+index d4691d922..c1b056933 100644
+--- a/testsuite/lib/mailutils.exp
++++ b/testsuite/lib/mailutils.exp
+@@ -728,7 +728,7 @@ proc mu_test_file {args} {
          set pattern [lrange $args 1 end]
      }
      
diff --git a/pkgs/tools/networking/mailutils/scm_c_string.patch b/pkgs/tools/networking/mailutils/scm_c_string.patch
deleted file mode 100644
index 367dd2d6406..00000000000
--- a/pkgs/tools/networking/mailutils/scm_c_string.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-See https://lists.gnu.org/archive/html/bug-mailutils/2010-10/msg00005.html
-
-diff -u mailutils-2.2/libmu_scm/mu_message.c mailutils-2.2.new/libmu_scm/mu_message.c
---- mailutils-2.2/libmu_scm/mu_message.c	2010-04-18 10:29:07.000000000 -0700
-+++ mailutils-2.2.new/libmu_scm/mu_message.c	2016-07-03 21:18:53.746185547 -0700
-@@ -510,8 +510,8 @@
-     {
-       SCM car = SCM_CAR (lst);
-       if (scm_is_string (car)
- 	  && mu_c_strncasecmp (scm_i_string_chars (car), name,
--			       scm_i_string_length (car)) == 0)
-+			       scm_c_string_length (car)) == 0)
- 	return 1;
-     }
-   return 0;
diff --git a/pkgs/tools/package-management/apt/default.nix b/pkgs/tools/package-management/apt/default.nix
new file mode 100644
index 00000000000..de1c2405076
--- /dev/null
+++ b/pkgs/tools/package-management/apt/default.nix
@@ -0,0 +1,65 @@
+{ stdenv, lib, fetchzip, pkgconfig, cmake, perl, curl, gtest, lzma, bzip2 , lz4
+, db, dpkg, libxslt, docbook_xsl, docbook_xml_dtd_45
+
+# used when WITH_DOC=ON
+, w3m
+, Po4a
+, doxygen
+
+# used when WITH_NLS=ON
+, gettext
+
+# opts
+, withDocs ? true
+, withNLS ? true
+}:
+
+stdenv.mkDerivation rec {
+  name = "apt-${version}";
+
+  version = "1.4.6";
+
+  src = fetchzip {
+    url = "https://launchpad.net/ubuntu/+archive/primary/+files/apt_${version}.tar.xz";
+    sha256 = "0ahwhmscrmnpvl1r732wg93dzkhv8c1sph2yrqgsrhr73c1616ix";
+  };
+
+  buildInputs = [
+    pkgconfig cmake perl curl gtest lzma bzip2 lz4 db dpkg libxslt.bin
+  ] ++ lib.optionals withDocs [
+    doxygen Po4a w3m
+  ] ++ lib.optionals withNLS [
+    gettext
+  ];
+
+  preConfigure = ''
+    export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${Po4a}/lib/perl5";
+
+    cmakeFlagsArray+=(
+      -DBERKELEY_DB_INCLUDE_DIRS="${db}"/include
+      -DDOCBOOK_XSL="${docbook_xsl}"/share/xml/docbook-xsl
+      -DROOT_GROUP=root
+      -DWITH_DOC=${if withDocs then "ON" else "OFF"}
+      -DUSE_NLS=${if withNLS then "ON" else "OFF"}
+    )
+
+    for f in doc/*; do
+      if [[ -f "$f" ]]; then
+        substituteInPlace "$f" \
+          --replace \
+            "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" \
+            "${docbook_xml_dtd_45}/xml/dtd/docbook/docbookx.dtd"
+      fi
+    done
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with lib; {
+    description = "";
+    homepage = "https://launchpad.net/ubuntu/+source/apt";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ cstrahan ];
+  };
+}
diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix
new file mode 100644
index 00000000000..388942f6ad8
--- /dev/null
+++ b/pkgs/tools/package-management/nix-index/default.nix
@@ -0,0 +1,32 @@
+{ lib, rustPlatform, fetchFromGitHub, pkgconfig, openssl, curl }:
+
+with rustPlatform;
+
+buildRustPackage rec {
+  name = "nix-index-${version}";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "bennofs";
+    repo = "nix-index";
+    rev = "v${version}";
+    sha256 = "1lmg65yqkwf2a5qxm3dmv8158kqhnriir062vlgar5wimf409rm5";
+  };
+  depsSha256 = "0v145fi9bfiwvsdy7hz9lw4m2f2j8sxvixfzmjwfnq4klm51c8yl";
+  buildInputs = [pkgconfig openssl curl];
+
+  postInstall = ''
+    mkdir -p $out/etc/profile.d
+    cp ./command-not-found.sh $out/etc/profile.d/command-not-found.sh
+    substituteInPlace $out/etc/profile.d/command-not-found.sh \
+      --replace "@out@" "$out"
+  '';
+
+  meta = with lib; {
+    description = "A files database for nixpkgs";
+    homepage = https://github.com/bennofs/nix-index;
+    license = with licenses; [ bsd3 ];
+    maintainers = [ maintainers.bennofs ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/tools/system/honcho/default.nix b/pkgs/tools/system/honcho/default.nix
index 6946862422b..d42a6488c7f 100644
--- a/pkgs/tools/system/honcho/default.nix
+++ b/pkgs/tools/system/honcho/default.nix
@@ -1,26 +1,45 @@
 { stdenv, fetchFromGitHub, pythonPackages }:
 
-let honcho = pythonPackages.buildPythonApplication rec {
-  name = "honcho-${version}";
-  version = "0.6.6";
+let
+  inherit (pythonPackages) python;
+  pname = "honcho";
+
+in
+
+pythonPackages.buildPythonApplication rec {
+  name = "${pname}-${version}";
+  version = "1.0.1";
   namePrefix = "";
 
   src = fetchFromGitHub {
     owner = "nickstenning";
     repo = "honcho";
     rev = "v${version}";
-    sha256 = "0lawwcyrrsd9z9jcr94qn1yabl9bzc529jkpc51jq720fhdlfcr0";
+    sha256 = "11bd87474qpif20xdcn0ra1idj5k16ka51i658wfpxwc6nzsn92b";
   };
 
-  buildInputs = with pythonPackages; [ nose mock jinja2 ];
+  buildInputs = with pythonPackages; [ jinja2 pytest mock coverage ];
+
+  buildPhase = ''
+    ${python.interpreter} setup.py build
+  '';
+
+  installPhase = ''
+    mkdir -p "$out/lib/${python.libPrefix}/site-packages"
+
+    export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
+
+    ${python}/bin/${python.executable} setup.py install \
+      --install-lib=$out/lib/${python.libPrefix}/site-packages \
+      --prefix="$out"
+  '';
+
   checkPhase = ''
     runHook preCheck
-    nosetests
+    PATH=$out/bin:$PATH coverage run -m pytest
     runHook postCheck
   '';
 
-  doCheck = false;
-
   meta = with stdenv.lib; {
     description = "A Python clone of Foreman, a tool for managing Procfile-based applications";
     license = licenses.mit;
@@ -28,11 +47,4 @@ let honcho = pythonPackages.buildPythonApplication rec {
     maintainers = with maintainers; [ benley ];
     platforms = platforms.unix;
   };
-};
-
-in
-
-# Some of honcho's tests require that honcho be installed in the environment in
-# order to work. This is a trick to build it without running tests, then pass
-# it to itself as a buildInput so the tests work.
-honcho.overrideDerivation (x: { buildInputs = [ honcho ]; doCheck = true; })
+}
diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix
new file mode 100644
index 00000000000..7924054b720
--- /dev/null
+++ b/pkgs/tools/system/osquery/default.nix
@@ -0,0 +1,79 @@
+{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake, pythonPackages
+, udev, audit, aws-sdk-cpp, cryptsetup, lvm2, libgcrypt, libarchive
+, libgpgerror, libuuid, iptables, apt, dpkg, lzma, lz4, bzip2, rpm
+, beecrypt, augeas, libxml2, sleuthkit, yara, lldpd, google-gflags
+, thrift, boost, rocksdb_lite, cpp-netlib, glog, gbenchmark, snappy
+, openssl, linenoise-ng, file, doxygen, devicemapper
+, gtest, sqlite
+}:
+
+let
+  thirdparty = fetchFromGitHub {
+    owner = "osquery";
+    repo = "third-party";
+    rev = "6919841175b2c9cb2dee8986e0cfe49191ecb868";
+    sha256 = "1kjxrky586jd1b2z1vs9cm7x1dxw51cizpys9kddiarapc2ih65j";
+  };
+
+in
+
+stdenv.mkDerivation rec {
+  name = "osquery-${version}";
+  version = "2.5.2";
+
+  # this is what `osquery --help` will show as the version.
+  OSQUERY_BUILD_VERSION = version;
+
+  src = fetchFromGitHub {
+    owner = "facebook";
+    repo = "osquery";
+    rev = version;
+    sha256 = "16isplk66qpvhrf041l0lxb4z6k7wwd1sg7kpsw2q6kivkxpnk3z";
+  };
+
+  patches = [ ./misc.patch ] ++ lib.optional stdenv.isLinux ./platform-nixos.patch;
+
+  nativeBuildInputs = [
+    pkgconfig cmake pythonPackages.python pythonPackages.jinja2
+  ];
+
+  buildInputs = [
+    udev audit
+
+    (aws-sdk-cpp.override {
+      apis = [ "firehose" "kinesis" "sts" ];
+      customMemoryManagement = false;
+    })
+
+    lvm2 libgcrypt libarchive libgpgerror libuuid iptables.dev apt dpkg
+    lzma lz4 bzip2 rpm beecrypt augeas libxml2 sleuthkit
+    yara lldpd google-gflags thrift boost
+    cpp-netlib glog gbenchmark snappy openssl linenoise-ng
+    file doxygen devicemapper cryptsetup
+    gtest sqlite
+
+    # need to be consistent about the malloc implementation
+    (rocksdb_lite.override { jemalloc = null; gperftools = null; })
+  ];
+
+  preConfigure = ''
+    export NIX_CFLAGS_COMPILE="-I${libxml2.dev}/include/libxml2 $NIX_CFLAGS_COMPILE"
+
+    cmakeFlagsArray+=(
+      -DCMAKE_LIBRARY_PATH=${cryptsetup}/lib
+      -DCMAKE_VERBOSE_MAKEFILE=OFF
+    )
+
+    cp -r ${thirdparty}/* third-party
+    chmod +w -R third-party
+    rm -r third-party/{googletest,sqlite3}
+  '';
+
+  meta = with lib; {
+    description = "SQL powered operating system instrumentation, monitoring, and analytics";
+    homepage = "https://osquery.io/";
+    license = licenses.bsd3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ cstrahan ];
+  };
+}
diff --git a/pkgs/tools/system/osquery/misc.patch b/pkgs/tools/system/osquery/misc.patch
new file mode 100644
index 00000000000..1a0ef267f0d
--- /dev/null
+++ b/pkgs/tools/system/osquery/misc.patch
@@ -0,0 +1,187 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a976a46d..408ac308 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -125,14 +125,13 @@ else()
+     set(CXX_COMPILE_FLAGS "${CXX_COMPILE_FLAGS} -std=c++14 -stdlib=libc++")
+   else()
+     set(LINUX TRUE)
+-    set(CXX_COMPILE_FLAGS "${CXX_COMPILE_FLAGS} -std=c++14 -stdlib=libstdc++")
++    set(CXX_COMPILE_FLAGS "${CXX_COMPILE_FLAGS} -std=c++14")
+   endif()
+   set(POSIX TRUE)
+ endif()
+ 
+ if(POSIX)
+   add_compile_options(
+-    -Qunused-arguments
+     -Wstrict-aliasing
+     -Wno-missing-field-initializers
+     -Wno-unused-local-typedef
+@@ -154,7 +153,6 @@ if(POSIX)
+   )
+   if(NOT FREEBSD)
+     add_compile_options(
+-      -Werror=shadow
+       -fvisibility=hidden
+       -fvisibility-inlines-hidden
+     )
+@@ -372,12 +370,6 @@ elseif(NOT FREEBSD)
+   endif()
+ endif()
+ 
+-if(NOT IS_DIRECTORY "${CMAKE_SOURCE_DIR}/third-party/sqlite3")
+-  WARNING_LOG("Cannot find git submodule third-party/sqlite3 directory")
+-  WARNING_LOG("Please run: make deps or git submodule update --init")
+-  message(FATAL_ERROR "No sqlite3 directory")
+-endif()
+-
+ # Make sure deps were built before compiling (else show warning).
+ execute_process(
+   COMMAND "${CMAKE_SOURCE_DIR}/tools/provision.sh" check "${CMAKE_BINARY_DIR}"
+@@ -439,6 +431,8 @@ endif()
+ 
+ if(APPLE)
+   LOG_PLATFORM("OS X")
++elseif(OSQUERY_BUILD_PLATFORM STREQUAL "nixos")
++  LOG_PLATFORM("NixOS")
+ elseif(OSQUERY_BUILD_PLATFORM STREQUAL "debian")
+   LOG_PLATFORM("Debian")
+ elseif(OSQUERY_BUILD_PLATFORM STREQUAL "ubuntu")
+@@ -477,7 +471,6 @@ if(POSIX)
+   include_directories("${BUILD_DEPS}/include/openssl")
+ endif()
+ 
+-include_directories("${CMAKE_SOURCE_DIR}/third-party/sqlite3")
+ include_directories("${CMAKE_SOURCE_DIR}/include")
+ include_directories("${CMAKE_SOURCE_DIR}")
+ 
+@@ -559,21 +552,10 @@ else()
+   set(GTEST_FLAGS "-DGTEST_USE_OWN_TR1_TUPLE=0")
+ endif()
+ 
+-set(GTEST_FLAGS
+-  ${GTEST_FLAGS}
+-  "-I${CMAKE_SOURCE_DIR}/third-party/googletest/googletest/include"
+-  "-I${CMAKE_SOURCE_DIR}/third-party/googletest/googlemock/include"
+-)
+-join("${GTEST_FLAGS}" " " GTEST_FLAGS)
+-
+ set(BUILD_GTEST TRUE)
+ 
+-add_subdirectory("${CMAKE_SOURCE_DIR}/third-party/googletest")
+-
+ include(Thrift)
+ 
+-add_subdirectory("${CMAKE_SOURCE_DIR}/third-party/sqlite3")
+-
+ add_subdirectory(osquery)
+ add_subdirectory(tools/tests)
+ 
+diff --git a/include/osquery/core.h b/include/osquery/core.h
+index b597edee..b0628037 100644
+--- a/include/osquery/core.h
++++ b/include/osquery/core.h
+@@ -15,8 +15,9 @@
+ #include <string>
+ #include <vector>
+ 
+-#if defined(__APPLE__) || defined(__FreeBSD__)
++#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__linux__)
+ #include <boost/thread/shared_mutex.hpp>
++#include <boost/thread/recursive_mutex.hpp>
+ #else
+ #include <shared_mutex>
+ #endif
+@@ -188,7 +189,7 @@ inline bool isPlatform(PlatformType a, const PlatformType& t = kPlatformType) {
+   return (static_cast<int>(t) & static_cast<int>(a)) != 0;
+ }
+ 
+-#if defined(__APPLE__) || defined(__FreeBSD__)
++#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__linux__)
+ #define MUTEX_IMPL boost
+ #else
+ #define MUTEX_IMPL std
+@@ -204,10 +205,10 @@ using WriteLock = MUTEX_IMPL::unique_lock<Mutex>;
+ using ReadLock = MUTEX_IMPL::shared_lock<Mutex>;
+ 
+ /// Helper alias for defining recursive mutexes.
+-using RecursiveMutex = std::recursive_mutex;
++using RecursiveMutex = MUTEX_IMPL::recursive_mutex;
+ 
+ /// Helper alias for write locking a recursive mutex.
+-using RecursiveLock = std::lock_guard<std::recursive_mutex>;
++using RecursiveLock = MUTEX_IMPL::lock_guard<MUTEX_IMPL::recursive_mutex>;
+ }
+ 
+ /**
+diff --git a/osquery/CMakeLists.txt b/osquery/CMakeLists.txt
+index 77913d31..671b20d4 100644
+--- a/osquery/CMakeLists.txt
++++ b/osquery/CMakeLists.txt
+@@ -57,7 +57,7 @@ endif()
+ 
+ # Construct a set of all object files, starting with third-party and all
+ # of the osquery core objects (sources from ADD_CORE_LIBRARY macros).
+-set(OSQUERY_OBJECTS $<TARGET_OBJECTS:osquery_sqlite>)
++set(OSQUERY_OBJECTS "")
+ 
+ # Add subdirectories
+ add_subdirectory(config)
+@@ -138,6 +138,8 @@ elseif(FREEBSD)
+   ADD_OSQUERY_LINK_ADDITIONAL("rocksdb-lite")
+ endif()
+ 
++ADD_OSQUERY_LINK_CORE("sqlite3")
++
+ if(POSIX)
+   ADD_OSQUERY_LINK_CORE("boost_system")
+   ADD_OSQUERY_LINK_CORE("boost_filesystem")
+@@ -157,6 +159,7 @@ ADD_OSQUERY_LINK_ADDITIONAL("cppnetlib-client-connections${WO_KEY}")
+ ADD_OSQUERY_LINK_CORE("glog${WO_KEY}")
+ 
+ if(POSIX)
++  ADD_OSQUERY_LINK_ADDITIONAL("benchmark")
+   ADD_OSQUERY_LINK_ADDITIONAL("snappy")
+   ADD_OSQUERY_LINK_ADDITIONAL("ssl")
+   ADD_OSQUERY_LINK_ADDITIONAL("crypto")
+@@ -336,13 +339,6 @@ if(NOT OSQUERY_BUILD_SDK_ONLY)
+ 
+   install(DIRECTORY "${CMAKE_SOURCE_DIR}/packs/"
+     DESTINATION "${CMAKE_INSTALL_PREFIX}/share/osquery/packs" COMPONENT main)
+-  if(APPLE)
+-    install(FILES "${CMAKE_SOURCE_DIR}/tools/deployment/com.facebook.osqueryd.plist"
+-      DESTINATION "${CMAKE_INSTALL_PREFIX}/share/osquery/" COMPONENT main)
+-  else()
+-    install(PROGRAMS "${CMAKE_SOURCE_DIR}/tools/deployment/osqueryd.initd"
+-      DESTINATION "/etc/init.d/" RENAME "osqueryd" COMPONENT main)
+-  endif()
+ endif()
+ 
+ if(NOT SKIP_TESTS)
+diff --git a/osquery/tables/system/linux/tests/md_tables_tests.cpp b/osquery/tables/system/linux/tests/md_tables_tests.cpp
+index 126be362..119d361d 100644
+--- a/osquery/tables/system/linux/tests/md_tables_tests.cpp
++++ b/osquery/tables/system/linux/tests/md_tables_tests.cpp
+@@ -72,7 +72,7 @@ void GetDrivesForArrayTestHarness(std::string arrayName,
+   EXPECT_CALL(md, getArrayInfo(arrayDevPath, _))
+       .WillOnce(DoAll(SetArgReferee<1>(arrayInfo), Return(true)));
+ 
+-  Sequence::Sequence s1;
++  Sequence s1;
+   for (int i = 0; i < MD_SB_DISKS; i++) {
+     mdu_disk_info_t diskInfo;
+     diskInfo.number = i;
+diff --git a/specs/windows/services.table b/specs/windows/services.table
+index 4ac24ee9..657d8b99 100644
+--- a/specs/windows/services.table
++++ b/specs/windows/services.table
+@@ -12,7 +12,7 @@ schema([
+     Column("path", TEXT, "Path to Service Executable"),
+     Column("module_path", TEXT, "Path to ServiceDll"),
+     Column("description", TEXT, "Service Description"),
+-    Column("user_account", TEXT, "The name of the account that the service process will be logged on as when it runs. This name can be of the form Domain\UserName. If the account belongs to the built-in domain, the name can be of the form .\UserName."),
++    Column("user_account", TEXT, "The name of the account that the service process will be logged on as when it runs. This name can be of the form Domain\\UserName. If the account belongs to the built-in domain, the name can be of the form .\\UserName."),
+ ])
+ implementation("system/windows/services@genServices")
+ examples([
diff --git a/pkgs/tools/system/osquery/platform-nixos.patch b/pkgs/tools/system/osquery/platform-nixos.patch
new file mode 100644
index 00000000000..7e1afcb640b
--- /dev/null
+++ b/pkgs/tools/system/osquery/platform-nixos.patch
@@ -0,0 +1,22 @@
+diff --git a/tools/get_platform.py b/tools/get_platform.py
+index 3dd34516..f53ca83a 100644
+--- a/tools/get_platform.py
++++ b/tools/get_platform.py
+@@ -26,6 +26,8 @@ DEBIAN_VERSION = "/etc/debian_version"
+ GENTOO_RELEASE = "/etc/gentoo-release"
+ 
+ def _platform():
++    return ("nixos", "nixos")
++
+     osType, _, _, _, _, _ = platform.uname()
+ 
+     if osType == "Windows":
+@@ -75,6 +77,8 @@ def _platform():
+         return (None, osType.lower())
+ 
+ def _distro(osType):
++    return "unknown_version"
++
+     def getRedhatDistroVersion(pattern):
+         with open(SYSTEM_RELEASE, "r") as fd:
+             contents = fd.read()
diff --git a/pkgs/tools/text/html-tidy/default.nix b/pkgs/tools/text/html-tidy/default.nix
index cc3283cf854..571dd41244b 100644
--- a/pkgs/tools/text/html-tidy/default.nix
+++ b/pkgs/tools/text/html-tidy/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "html-tidy-${version}";
-  version = "5.2.0";
+  version = "5.4.0";
 
   src = fetchFromGitHub {
     owner = "htacg";
     repo = "tidy-html5";
     rev = version;
-    sha256 = "1yxp3kjsxd5zwwn4r5rpyq5ndyylbcnb9pisdyf7dxjqd47z64bc";
+    sha256 = "1q9ag2dh2j636fw9vyz6gg0kiss8p6lvj22h25nqsw0daan57c32";
   };
 
   nativeBuildInputs = [ cmake libxslt/*manpage*/ ];
@@ -33,4 +33,3 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ edwtjo ];
   };
 }
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b50193f27c5..1456c13da43 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -531,6 +531,10 @@ with pkgs;
 
   apg = callPackage ../tools/security/apg { };
 
+  apt = callPackage ../tools/package-management/apt {
+    inherit (perlPackages) Po4a;
+  };
+
   autorevision = callPackage ../tools/misc/autorevision { };
 
   bcachefs-tools = callPackage ../tools/filesystems/bcachefs-tools { };
@@ -1065,6 +1069,8 @@ with pkgs;
 
   kapacitor = callPackage ../servers/monitoring/kapacitor { };
 
+  lcdproc = callPackage ../servers/monitoring/lcdproc { };
+
   languagetool = callPackage ../tools/text/languagetool {  };
 
   loccount = callPackage ../development/tools/misc/loccount { };
@@ -3069,6 +3075,7 @@ with pkgs;
   mailpile = callPackage ../applications/networking/mailreaders/mailpile { };
 
   mailutils = callPackage ../tools/networking/mailutils {
+    guile = guile_2_0;  # compilation fails with guile 2.2
     sasl = gsasl;
   };
 
@@ -3914,6 +3921,8 @@ with pkgs;
 
   quilt = callPackage ../development/tools/quilt { };
 
+  quota = callPackage ../tools/misc/quota { };
+
   wiggle = callPackage ../development/tools/wiggle { };
 
   radamsa = callPackage ../tools/security/radamsa { };
@@ -6089,7 +6098,7 @@ with pkgs;
 
   inherit (beam.interpreters)
     erlang erlang_odbc erlang_javac erlang_odbc_javac
-    elixir elixir_1_5_rc elixir_1_4 elixir_1_3
+    elixir elixir_1_5 elixir_1_4 elixir_1_3
     lfe lfe_1_2
     erlangR16 erlangR16_odbc
     erlang_basho_R16B02 erlang_basho_R16B02_odbc
@@ -7352,7 +7361,9 @@ with pkgs;
 
   grabserial = callPackage ../development/tools/grabserial { };
 
-  mypy = callPackage ../development/tools/mypy { };
+  mypy = callPackage ../development/tools/mypy {
+    inherit (python3Packages) fetchPypi buildPythonApplication lxml typed-ast;
+  };
 
 
   ### DEVELOPMENT / LIBRARIES
@@ -7363,8 +7374,6 @@ with pkgs;
 
   aalib = callPackage ../development/libraries/aalib { };
 
-  accelio = callPackage ../development/libraries/accelio { stdenv = overrideCC stdenv gcc5; };
-
   accountsservice = callPackage ../development/libraries/accountsservice { };
 
   acl = callPackage ../development/libraries/acl { };
@@ -7458,6 +7467,7 @@ with pkgs;
   boost160 = callPackage ../development/libraries/boost/1.60.nix { };
   boost162 = callPackage ../development/libraries/boost/1.62.nix { };
   boost163 = callPackage ../development/libraries/boost/1.63.nix { };
+  boost164 = callPackage ../development/libraries/boost/1.64.nix { };
   boost = boost162;
 
   boost_process = callPackage ../development/libraries/boost-process { };
@@ -9346,6 +9356,8 @@ with pkgs;
 
   linenoise = callPackage ../development/libraries/linenoise { };
 
+  linenoise-ng = callPackage ../development/libraries/linenoise-ng { };
+
   lirc = callPackage ../development/libraries/lirc { };
 
   liquid-dsp = callPackage ../development/libraries/liquid-dsp { };
@@ -10085,6 +10097,8 @@ with pkgs;
 
   rocksdb = callPackage ../development/libraries/rocksdb { };
 
+  rocksdb_lite = rocksdb.override { enableLite = true; };
+
   rote = callPackage ../development/libraries/rote { };
 
   ronn = callPackage ../development/tools/ronn { };
@@ -12132,8 +12146,6 @@ with pkgs;
 
     inherit kernel;
 
-    accelio = callPackage ../development/libraries/accelio { };
-
     acpi_call = callPackage ../os-specific/linux/acpi-call {};
 
     amdgpu-pro = callPackage ../os-specific/linux/amdgpu-pro { };
@@ -14131,6 +14143,8 @@ with pkgs;
 
   gksu = callPackage ../applications/misc/gksu { };
 
+  gnss-sdr = callPackage ../applications/misc/gnss-sdr { };
+
   gnuradio = callPackage ../applications/misc/gnuradio {
     inherit (python2Packages) cheetah lxml matplotlib numpy python pyopengl pyqt4 scipy wxPython pygtk;
     fftw = fftwFloat;
@@ -14527,7 +14541,7 @@ with pkgs;
 
   gosmore = callPackage ../applications/misc/gosmore { };
 
-  gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel {
+  gpsbabel = libsForQt56.callPackage ../applications/misc/gpsbabel {
     inherit (darwin) IOKit;
   };
 
@@ -15508,6 +15522,8 @@ with pkgs;
 
   osmo = callPackage ../applications/office/osmo { };
 
+  osquery = callPackage ../tools/system/osquery { };
+
   palemoon = callPackage ../applications/networking/browsers/palemoon {
     # https://forum.palemoon.org/viewtopic.php?f=57&t=15296#p111146
     stdenv = overrideCC stdenv gcc49;
@@ -16440,6 +16456,8 @@ with pkgs;
     flags = [ "python" "X11" ]; # only flag "X11" by now
   });
 
+  xxd = callPackage ../tools/misc/xxd { };
+
   vimNox = lowPrio (vim_configurable.override { source = "vim-nox"; });
 
   qpdfview = callPackage ../applications/misc/qpdfview {};
@@ -18665,12 +18683,14 @@ with pkgs;
 
   nixops = callPackage ../tools/package-management/nixops { };
 
-  nixopsUnstable = callPackage ../tools/package-management/nixops/unstable.nix { };
+  nixopsUnstable = lowPrio (callPackage ../tools/package-management/nixops/unstable.nix { });
 
   nixui = callPackage ../tools/package-management/nixui { node_webkit = nwjs_0_12; };
 
   nix-bundle = callPackage ../tools/package-management/nix-bundle { nix = nixUnstable; };
 
+  nix-index = callPackage ../tools/package-management/nix-index { };
+
   inherit (callPackages ../tools/package-management/nix-prefetch-scripts { })
     nix-prefetch-bzr
     nix-prefetch-cvs
diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index 62ffaec26f3..fd2a5569171 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -56,7 +56,7 @@ rec {
     # Other Beam languages. These are built with `beam.interpreters.erlang`. To
     # access for example elixir built with different version of Erlang, use
     # `beam.packages.erlangR19.elixir`.
-    inherit (packages.erlang) elixir elixir_1_5_rc elixir_1_4 elixir_1_3;
+    inherit (packages.erlang) elixir elixir_1_5 elixir_1_4 elixir_1_3;
 
     inherit (packages.erlang) lfe lfe_1_2;
   };
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 0bd8b0c5b0d..e7234018508 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2859,16 +2859,15 @@ let self = _self // overrides; _self = with self; {
   };
 
   CryptX = buildPerlPackage rec {
-    name = "CryptX-0.044";
+    name = "CryptX-0.050";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz";
-      sha256 = "15e5e6bd7b90af24c7e730751fec7b10d8e22ef4380d527bda242dee7dd20443";
+      sha256 = "c1de040779d9f5482d0a2f17a9a5aa6b069c7c58c07fbe26ab62bc689a5c9161";
     };
     propagatedBuildInputs = [ JSONMaybeXS ];
     meta = {
       description = "Crypto toolkit";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -10755,10 +10754,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   PerlCritic = buildPerlModule rec {
-    name = "Perl-Critic-1.128";
+    name = "Perl-Critic-1.130";
     src = fetchurl {
       url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz";
-      sha256 = "83ce563da0a950946367323214b6db30d72db7d006dce24c2a00a9ec13ddb9b4";
+      sha256 = "0662e8f02dd78e39ee9d5b01bdf5376a7cc70ce2b0edc9ca015be35e6cb61df6";
     };
     buildInputs = [ ModuleBuild TestDeep ];
     propagatedBuildInputs = [ BKeywords ConfigTiny EmailAddress ExceptionClass FileHomeDir FileWhich IOString ListMoreUtils ModulePluggable PPI PPIxRegexp PPIxUtilities PerlTidy PodSpell Readonly StringFormat TaskWeaken ];
@@ -15011,16 +15010,16 @@ let self = _self // overrides; _self = with self; {
   };
 
   UnicodeCaseFold = buildPerlModule rec {
-    name = "Unicode-CaseFold-1.00";
+    name = "Unicode-CaseFold-1.01";
     src = fetchurl {
       url = "mirror://cpan/authors/id/A/AR/ARODLAND/${name}.tar.gz";
-      sha256 = "c489b5a440e84b0554e866d3fe4077fa1956eeed473e203588e0c24acce1f016";
+      sha256 = "418a212808f9d0b8bb330ac905096d2dd364976753d4c71534dab9836a63194d";
     };
+    buildInputs = [ ModuleBuild ];
     meta = {
       homepage = http://metacpan.org/release/Unicode-CaseFold;
       description = "Unicode case-folding for case-insensitive lookups";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ stdenv.lib.maintainers.rycee ];
     };
   };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c3239fc4c98..8743b9903dd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -106,6 +106,10 @@ in {
 
   astropy = callPackage ../development/python-modules/astropy {  };
 
+  augeas = callPackage ../development/python-modules/augeas {
+    inherit (pkgs) augeas;
+  };
+
   automat = callPackage ../development/python-modules/automat { };
 
   # packages defined elsewhere
@@ -190,6 +194,26 @@ in {
 
   pycryptodome = callPackage ../development/python-modules/pycryptodome { };
 
+  PyChromecast = buildPythonPackage rec {
+    name    = "PyChromecast-${version}";
+    version = "0.8.1";
+
+    src = pkgs.fetchurl {
+      url    = "mirror://pypi/p/pychromecast/${name}.tar.gz";
+      sha256 = "05rlr2hjng0xg2a9k9vwmrlvd7vy9sjhxxfl96kx25xynlkq6yq6";
+    };
+
+    propagatedBuildInputs = with self; [ requests six zeroconf protobuf3_2 ];
+
+    meta = {
+      description = "Library for Python 2 and 3 to communicate with the Google Chromecast";
+      homepage    = "https://github.com/balloob/pychromecast";
+      license     = licenses.mit;
+      maintainers = with maintainers; [ abbradar ];
+      platforms   = platforms.linux;
+    };
+  };
+
   pyexiv2 = if (!isPy3k) then callPackage ../development/python-modules/pyexiv2 {} else throw "pyexiv2 not supported for interpreter ${python.executable}";
 
   pygame = callPackage ../development/python-modules/pygame { };
@@ -11345,6 +11369,50 @@ in {
     propagatedBuildInputs = with self; [ requests webob ];
   };
 
+  hmmlearn = buildPythonPackage rec {
+    name = "hmmlearn-${version}";
+    version = "0.2.0";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/h/hmmlearn/${name}.tar.gz";
+      sha256 = "0qc3fkdyrgfg31y1a8jzs83dxkjw78pqkdm44lll1iib63w4cik9";
+    };
+
+    propagatedBuildInputs = with self; [ numpy ];
+
+    doCheck = false;
+
+    meta = {
+      description = "Hidden Markov Models in Python with scikit-learn like API";
+      homepage    = "https://github.com/hmmlearn/hmmlearn";
+      license     = licenses.bsd3;
+      maintainers = with maintainers; [ abbradar ];
+      platforms   = platforms.unix;
+    };
+  };
+
+   sphfile = buildPythonPackage rec {
+    name = "sphfile-${version}";
+    version = "1.0.0";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/s/sphfile/${name}.tar.gz";
+      sha256 = "1ly9746xrzbiax9cxr5sxlg0wvf6fdxcrgwsqqxckk3wnqfypfrd";
+    };
+
+    propagatedBuildInputs = with self; [ numpy ];
+
+    doCheck = false;
+
+    meta = {
+      description = "Numpy-based NIST SPH audio-file reader";
+      homepage    = "https://github.com/mcfletch/sphfile";
+      license     = licenses.mit;
+      maintainers = with maintainers; [ abbradar ];
+      platforms   = platforms.unix;
+    };
+  }; 
+
   hcs_utils = buildPythonPackage rec {
     name = "hcs_utils-1.5";
 
diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix
index 5e280fb91c4..1caef26322d 100644
--- a/pkgs/top-level/rust-packages.nix
+++ b/pkgs/top-level/rust-packages.nix
@@ -7,13 +7,13 @@
 { stdenv, fetchFromGitHub, git }:
 
 stdenv.mkDerivation {
-  name = "rustRegistry-2017-07-17";
+  name = "rustRegistry-2017-07-23";
 
   src = fetchFromGitHub {
     owner = "rust-lang";
     repo = "crates.io-index";
-    rev = "14f1d497ede721229b23ad1e8b6122f34761f1a6";
-    sha256 = "1a9aav9yg7ffrilsnzlbaysxgzfzg455jfdh260n9y6wvpnpfvg9";
+    rev = "ed8e6a6761278861db046073cc69d6a5e7dd8c15";
+    sha256 = "1v72m0h31xcay2m64n2wil5wqnl8z4n4adxxpdllcpgj3pj5jai6";
   };
   phases = [ "unpackPhase" "installPhase" ];
   installPhase = ''