Merge remote-tracking branch 'upstream/master' into HEAD

41 files changed, 1681 insertions, 1056 deletions

diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix
index 936cde61ee8..fc2e8aa03de 100644
--- a/pkgs/applications/editors/zile/default.nix
+++ b/pkgs/applications/editors/zile/default.nix
@@ -9,7 +9,12 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ pkgconfig ncurses boehmgc ];
-  nativeBuildInputs = [ help2man perl ];
+  nativeBuildInputs = [ perl ]
+    # `help2man' wants to run Zile, which won't work when the
+    # newly-produced binary can't be run at build-time.
+    ++ stdenv.lib.optional
+         (stdenv.hostPlatform == stdenv.buildPlatform)
+         help2man;
 
   # Tests can't be run because most of them rely on the ability to
   # fiddle with the terminal.
diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix
index d84671cfa8c..ad3d72e9ef5 100644
--- a/pkgs/applications/misc/ocropus/default.nix
+++ b/pkgs/applications/misc/ocropus/default.nix
@@ -19,11 +19,11 @@ let
 in
 pythonPackages.buildPythonApplication rec {
   name = "ocropus-${version}";
-  version = "20150316";
+  version = "20170811";
 
   src = fetchFromGitHub {
-    sha256 = "0m5bm2ah3p29c13vp7hz7rm058qnlm840zd8xv20byijhlz0447g";
-    rev = "5ba07bb959d605ec15424dd2b8f3d7245820084e";
+    sha256 = "0qx0d8yj0w66qglkrmfavp5dh1sky72njfaqii7bnrpv5n4j3q39";
+    rev = "ae84a8edaf0b76135f749ba66fc30c272d0726d0";
     repo = "ocropy";
     owner = "tmbdev";
   };
@@ -37,7 +37,8 @@ pythonPackages.buildPythonApplication rec {
     ${concatStrings (map (x: "cp -R ${x.src} models/`basename ${x.name}`;")
       models)}
 
-    substituteInPlace ocrolib/{common,default}.py --replace /usr/local $out
+    substituteInPlace ocrolib/common.py --replace /usr/local $out
+    substituteInPlace ocrolib/default.py --replace /usr/local $out
   '';
 
   doCheck = false;  # fails
diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix
index 1f1a19394b3..9ed954cc7ec 100644
--- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix
+++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix
@@ -1,15 +1,17 @@
-{ stdenv, lib, fetchurl
+{ stdenv, lib, fetchFromGitHub
   , qt4, qmake4Hook, openssl
   , xproto, libX11, libXScrnSaver, scrnsaverproto
   , xz, zlib
 }:
 stdenv.mkDerivation rec {
   name = "vacuum-im-${version}";
-  version = "1.2.4";
+  version = "1.3.0.20160104";
 
-  src = fetchurl {
-    url = "https://googledrive.com/host/0B7A5K_290X8-d1hjQmJaSGZmTTA/vacuum-${version}.tar.gz";
-    sha256 = "10qxpfbbaagqcalhk0nagvi5irbbz5hk31w19lba8hxf6pfylrhf";
+  src = fetchFromGitHub {
+    owner = "Vacuum-IM";
+    repo = "vacuum-im";
+    rev = "1.3.0.20160104-Alpha";
+    sha256 = "1jcw9c7s75y4c3m4skfc3cc0i519z39b23n997vj5mwcjplxyc76";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix
index fe6090c3230..24c5b4335c4 100644
--- a/pkgs/applications/video/mplayer/default.nix
+++ b/pkgs/applications/video/mplayer/default.nix
@@ -102,8 +102,7 @@ stdenv.mkDerivation rec {
     rm -rf ffmpeg
   '';
 
-  depsBuildBuild = [ buildPackages.stdenv.cc ];
-  nativeBuildInputs = [ pkgconfig yasm ];
+  nativeBuildInputs = [ buildPackages.stdenv.cc pkgconfig yasm ];
   buildInputs = with stdenv.lib;
     [ freetype ffmpeg ]
     ++ optional aalibSupport aalib
diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/pkgs/applications/virtualization/spice-vdagent/default.nix
index 7a43a8b8800..5608f4ed359 100644
--- a/pkgs/applications/virtualization/spice-vdagent/default.nix
+++ b/pkgs/applications/virtualization/spice-vdagent/default.nix
@@ -1,5 +1,6 @@
 {stdenv, fetchurl, pkgconfig, alsaLib, spice_protocol, glib,
- libpciaccess, libxcb, libXrandr, libXinerama, libXfixes, dbus}:
+ libpciaccess, libxcb, libXrandr, libXinerama, libXfixes, dbus,
+ systemd}:
 stdenv.mkDerivation rec {
   name = "spice-vdagent-0.17.0";
   src = fetchurl {
@@ -11,7 +12,7 @@ stdenv.mkDerivation rec {
   '';
   buildInputs = [ pkgconfig alsaLib spice_protocol glib
                   libpciaccess libxcb libXrandr libXinerama libXfixes
-                  dbus ] ;
+                  dbus systemd ] ;
   meta = {
     description = "Enhanced SPICE integration for linux QEMU guest";
     longDescription = ''
diff --git a/pkgs/development/compilers/gcc/libstdc++-hook.sh b/pkgs/development/compilers/gcc/libstdc++-hook.sh
new file mode 100644
index 00000000000..2d30c845b5a
--- /dev/null
+++ b/pkgs/development/compilers/gcc/libstdc++-hook.sh
@@ -0,0 +1,2 @@
+export NIX_CXXSTDLIB_COMPILE+="-isystem $(echo -n @gcc@/include/c++/*) -isystem $(echo -n @gcc@/include/c++/*)/$(@gcc@/bin/gcc -dumpmachine)"
+export NIX_CXXSTDLIB_LINK=" -stdlib=libstdc++"
diff --git a/pkgs/development/compilers/ghc/7.10.2.nix b/pkgs/development/compilers/ghc/7.10.2.nix
index 726fad77865..863f904e4e9 100644
--- a/pkgs/development/compilers/ghc/7.10.2.nix
+++ b/pkgs/development/compilers/ghc/7.10.2.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     sha256 = "1x8m4rp2v7ydnrz6z9g8x7z3x3d3pxhv2pixy7i7hkbqbdsp7kal";
   };
 
-  buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 (stdenv.lib.getBin hscolour) ];
+  buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ];
 
   patches = [ ./relocation.patch ];
 
diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix
index 943bc8b124b..eb8f1dddd19 100644
--- a/pkgs/development/compilers/ghc/7.10.3.nix
+++ b/pkgs/development/compilers/ghc/7.10.3.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     ./relocation.patch
   ];
 
-  buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 (stdenv.lib.getBin hscolour) ];
+  buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix
index 8e800b78d66..6e47ee92630 100644
--- a/pkgs/development/compilers/ghc/8.0.1.nix
+++ b/pkgs/development/compilers/ghc/8.0.1.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     (fetchFilteredPatch { url = https://git.haskell.org/ghc.git/patch/2f8cd14fe909a377b3e084a4f2ded83a0e6d44dd; sha256 = "06zvlgcf50ab58bw6yw3krn45dsmhg4cmlz4nqff8k4z1f1bj01v"; })
   ] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch;
 
-  buildInputs = [ ghc perl (stdenv.lib.getBin hscolour) sphinx];
+  buildInputs = [ ghc perl hscolour sphinx];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix
index 85aca075d86..e50a8df7352 100644
--- a/pkgs/development/compilers/ghc/8.0.2.nix
+++ b/pkgs/development/compilers/ghc/8.0.2.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch
     ++ stdenv.lib.optional stdenv.isDarwin ./ghc-8.0.2-no-cpp-warnings.patch;
 
-  buildInputs = [ ghc perl (stdenv.lib.getBin hscolour) sphinx ];
+  buildInputs = [ ghc perl hscolour sphinx ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/compilers/ghc/8.2.1.nix b/pkgs/development/compilers/ghc/8.2.1.nix
index 5b76e9ebea7..bce51f92c0b 100644
--- a/pkgs/development/compilers/ghc/8.2.1.nix
+++ b/pkgs/development/compilers/ghc/8.2.1.nix
@@ -11,7 +11,7 @@ let
   inherit (bootPkgs) ghc;
   version = "8.2.1";
   preReleaseName = "ghc-8.2.1";
-  commonBuildInputs = [ (stdenv.lib.getBin alex) autoconf automake ghc (stdenv.lib.getBin happy) (stdenv.lib.getBin hscolour) perl python3 sphinx ];
+  commonBuildInputs = [ alex autoconf automake ghc happy hscolour perl python3 sphinx ];
   commonPreConfigure =  ''
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
   '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 491c014d26d..362b4895b7e 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -11,7 +11,7 @@
 let
   inherit (bootPkgs) ghc;
 
-  commonBuildInputs = [ ghc perl autoconf automake (stdenv.lib.getBin happy) (stdenv.lib.getBin alex) python3 ];
+  commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ];
 
   rev = "14457cf6a50f708eecece8f286f08687791d51f7";
 
diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix
index 051e7daaa3e..a7381fa1a14 100644
--- a/pkgs/development/compilers/ghcjs/base.nix
+++ b/pkgs/development/compilers/ghcjs/base.nix
@@ -118,7 +118,7 @@ in mkDerivation (rec {
     lens optparse-applicative parallel safe shelly split
     stringsearch syb system-fileio system-filepath tar terminfo text-binary
     unordered-containers vector wl-pprint-text yaml
-    (stdenv.lib.getBin alex) (stdenv.lib.getBin happy) git gnumake autoconf automake libtool patch gmp
+    alex happy git gnumake autoconf automake libtool patch gmp
     base16-bytestring cryptohash executable-path haddock-api
     transformers-compat QuickCheck haddock hspec xhtml
     regex-posix libiconv
diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix
new file mode 100644
index 00000000000..1a148447c6b
--- /dev/null
+++ b/pkgs/development/compilers/go/1.9.nix
@@ -0,0 +1,181 @@
+{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
+, perl, which, pkgconfig, patch, fetchpatch
+, pcre, cacert, llvm
+, Security, Foundation, bash
+, makeWrapper, git, subversion, mercurial, bazaar }:
+
+let
+
+  inherit (stdenv.lib) optional optionals optionalString;
+
+  clangHack = writeScriptBin "clang" ''
+    #!${stdenv.shell}
+    exec ${stdenv.cc}/bin/clang "$@" 2> >(sed '/ld: warning:.*ignoring unexpected dylib file/ d' 1>&2)
+  '';
+
+  goBootstrap = runCommand "go-bootstrap" {} ''
+    mkdir $out
+    cp -rf ${go_bootstrap}/* $out/
+    chmod -R u+w $out
+    find $out -name "*.c" -delete
+    cp -rf $out/bin/* $out/share/go/bin/
+  '';
+
+in
+
+stdenv.mkDerivation rec {
+  name = "go-${version}";
+  version = "1.9";
+
+  src = fetchFromGitHub {
+    owner = "golang";
+    repo = "go";
+    rev = "go${version}";
+    sha256 = "06k66x387r93m7d3bd5yzwdm8f8xc43cdjfamqldfc1v8ngak0y9";
+  };
+
+  # perl is used for testing go vet
+  nativeBuildInputs = [ perl which pkgconfig patch makeWrapper ];
+  buildInputs = [ pcre ]
+    ++ optionals stdenv.isLinux [ stdenv.glibc.out stdenv.glibc.static ];
+  propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ];
+
+  hardeningDisable = [ "all" ];
+
+  prePatch = ''
+    patchShebangs ./ # replace /bin/bash
+
+    # This source produces shell script at run time,
+    # and thus it is not corrected by patchShebangs.
+    substituteInPlace misc/cgo/testcarchive/carchive_test.go \
+      --replace '#!/usr/bin/env bash' '#!${stdenv.shell}'
+
+    # Disabling the 'os/http/net' tests (they want files not available in
+    # chroot builds)
+    rm src/net/{listen,parse}_test.go
+    rm src/syscall/exec_linux_test.go
+
+    # !!! substituteInPlace does not seems to be effective.
+    # The os test wants to read files in an existing path. Just don't let it be /usr/bin.
+    sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go
+    sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go
+    # Disable the unix socket test
+    sed -i '/TestShutdownUnix/areturn' src/net/net_test.go
+    # Disable the hostname test
+    sed -i '/TestHostname/areturn' src/os/os_test.go
+    # ParseInLocation fails the test
+    sed -i '/TestParseInSydney/areturn' src/time/format_test.go
+    # Remove the api check as it never worked
+    sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go
+    # Remove the coverage test as we have removed this utility
+    sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go
+    # Remove the timezone naming test
+    sed -i '/TestLoadFixed/areturn' src/time/time_test.go
+    # Remove disable setgid test
+    sed -i '/TestRespectSetgidDir/areturn' src/cmd/go/internal/work/build_test.go
+    # Remove cert tests that conflict with NixOS's cert resolution
+    sed -i '/TestEnvVars/areturn' src/crypto/x509/root_unix_test.go
+
+    sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go
+    sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go
+
+    # Disable cgo lookup tests not works, they depend on resolver
+    rm src/net/cgo_unix_test.go
+
+  '' + optionalString stdenv.isLinux ''
+    sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go
+  '' + optionalString stdenv.isArm ''
+    sed -i '/TestCurrent/areturn' src/os/user/user_test.go
+    echo '#!/usr/bin/env bash' > misc/cgo/testplugin/test.bash
+  '' + optionalString stdenv.isDarwin ''
+    substituteInPlace src/race.bash --replace \
+      "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true
+    sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go
+    sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go
+    sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go
+
+    sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go
+    sed -i '/TestRead0/areturn' src/os/os_test.go
+    sed -i '/TestNohup/areturn' src/os/signal/signal_test.go
+    sed -i '/TestCurrent/areturn' src/os/user/user_test.go
+    sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go
+
+    sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go
+    sed -i '/TestBuildDashIInstallsDependencies/areturn' src/cmd/go/go_test.go
+
+    sed -i '/TestDisasmExtld/areturn' src/cmd/objdump/objdump_test.go
+
+    sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go
+    sed -i 's/unrecognized/unknown/' src/cmd/go/build.go
+
+    touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd
+
+    sed -i '1 a\exit 0' misc/cgo/errors/test.bash
+  '';
+
+  patches =
+    [ ./remove-tools-1.9.patch
+      ./ssl-cert-file-1.9.patch
+      ./creds-test.patch
+      ./remove-test-pie-1.9.patch
+    ];
+
+  postPatch = optionalString stdenv.isDarwin ''
+    echo "substitute hardcoded dsymutil with ${llvm}/bin/llvm-dsymutil"
+    substituteInPlace "src/cmd/link/internal/ld/lib.go" --replace dsymutil ${llvm}/bin/llvm-dsymutil
+  '';
+
+  NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+
+  GOOS = if stdenv.isDarwin then "darwin" else "linux";
+  GOARCH = if stdenv.isDarwin then "amd64"
+           else if stdenv.system == "i686-linux" then "386"
+           else if stdenv.system == "x86_64-linux" then "amd64"
+           else if stdenv.isArm then "arm"
+           else throw "Unsupported system";
+  GOARM = optionalString (stdenv.system == "armv5tel-linux") "5";
+  GO386 = 387; # from Arch: don't assume sse2 on i686
+  CGO_ENABLED = 1;
+  GOROOT_BOOTSTRAP = "${goBootstrap}/share/go";
+
+  # The go build actually checks for CC=*/clang and does something different, so we don't
+  # just want the generic `cc` here.
+  CC = if stdenv.isDarwin then "clang" else "cc";
+
+  configurePhase = ''
+    mkdir -p $out/share/go/bin
+    export GOROOT=$out/share/go
+    export GOBIN=$GOROOT/bin
+    export PATH=$GOBIN:$PATH
+  '';
+
+  postConfigure = optionalString stdenv.isDarwin ''
+    export PATH=${clangHack}/bin:$PATH
+  '';
+
+  installPhase = ''
+    cp -r . $GOROOT
+    ( cd $GOROOT/src && ./all.bash )
+
+    # (https://github.com/golang/go/wiki/GoGetTools)
+    wrapProgram $out/share/go/bin/go --prefix PATH ":" "${stdenv.lib.makeBinPath [ git subversion mercurial bazaar ]}"
+  '';
+
+  preFixup = ''
+    rm -r $out/share/go/pkg/bootstrap
+    ln -s $out/share/go/bin $out/bin
+  '';
+
+  setupHook = ./setup-hook.sh;
+
+  disallowedReferences = [ go_bootstrap ];
+
+  meta = with stdenv.lib; {
+    branch = "1.8";
+    homepage = http://golang.org/;
+    description = "The Go Programming language";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ cstrahan wkennington ];
+    platforms = platforms.linux ++ platforms.darwin;
+  };
+}
diff --git a/pkgs/development/compilers/go/remove-test-pie-1.9.patch b/pkgs/development/compilers/go/remove-test-pie-1.9.patch
new file mode 100644
index 00000000000..46f94f29df2
--- /dev/null
+++ b/pkgs/development/compilers/go/remove-test-pie-1.9.patch
@@ -0,0 +1,26 @@
+diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
+index 73432d31ea..3310f5298d 100644
+--- a/src/cmd/dist/test.go
++++ b/src/cmd/dist/test.go
+@@ -510,21 +510,6 @@ func (t *tester) registerTests() {
+ 		})
+ 	}
+ 
+-	// Test internal linking of PIE binaries where it is supported.
+-	if t.goos == "linux" && t.goarch == "amd64" && !isAlpineLinux() {
+-		// Issue 18243: We don't have a way to set the default
+-		// dynamic linker used in internal linking mode. So
+-		// this test is skipped on Alpine.
+-		t.tests = append(t.tests, distTest{
+-			name:    "pie_internal",
+-			heading: "internal linking of -buildmode=pie",
+-			fn: func(dt *distTest) error {
+-				t.addCmd(dt, "src", "go", "test", "reflect", "-short", "-buildmode=pie", "-ldflags=-linkmode=internal", t.timeout(60), t.tags(), t.runFlag(""))
+-				return nil
+-			},
+-		})
+-	}
+-
+ 	// sync tests
+ 	t.tests = append(t.tests, distTest{
+ 		name:    "sync_cpu",
diff --git a/pkgs/development/compilers/go/remove-tools-1.9.patch b/pkgs/development/compilers/go/remove-tools-1.9.patch
new file mode 100644
index 00000000000..e76ed61693a
--- /dev/null
+++ b/pkgs/development/compilers/go/remove-tools-1.9.patch
@@ -0,0 +1,35 @@
+diff --git a/src/go/build/build.go b/src/go/build/build.go
+index d8163d0172..dd80a70473 100644
+--- a/src/go/build/build.go
++++ b/src/go/build/build.go
+@@ -1592,7 +1592,7 @@ func init() {
+ }
+ 
+ // ToolDir is the directory containing build tools.
+-var ToolDir = filepath.Join(runtime.GOROOT(), "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH)
++var ToolDir = runtime.GOTOOLDIR()
+ 
+ // IsLocalImport reports whether the import path is
+ // a local import path, like ".", "..", "./foo", or "../foo".
+diff --git a/src/runtime/extern.go b/src/runtime/extern.go
+index 6e6c674d96..e9f62f96dc 100644
+--- a/src/runtime/extern.go
++++ b/src/runtime/extern.go
+@@ -223,6 +223,17 @@ func GOROOT() string {
+ 	return sys.DefaultGoroot
+ }
+ 
++// GOTOOLDIR returns the root of the Go tree.
++// It uses the GOTOOLDIR environment variable, if set,
++// or else the root used during the Go build.
++func GOTOOLDIR() string {
++	s := gogetenv("GOTOOLDIR")
++	if s != "" {
++		return s
++	}
++	return GOROOT() + "/pkg/tool/" + GOOS + "_" + GOARCH
++}
++
+ // Version returns the Go tree's version string.
+ // It is either the commit hash and date at the time of the build or,
+ // when possible, a release tag like "go1.3".
diff --git a/pkgs/development/compilers/go/ssl-cert-file-1.9.patch b/pkgs/development/compilers/go/ssl-cert-file-1.9.patch
new file mode 100644
index 00000000000..3f27bc138c1
--- /dev/null
+++ b/pkgs/development/compilers/go/ssl-cert-file-1.9.patch
@@ -0,0 +1,80 @@
+diff --git a/src/crypto/x509/root_cgo_darwin.go b/src/crypto/x509/root_cgo_darwin.go
+index 8e80533590..31c0c666ec 100644
+--- a/src/crypto/x509/root_cgo_darwin.go
++++ b/src/crypto/x509/root_cgo_darwin.go
+@@ -201,11 +201,20 @@ int FetchPEMRoots(CFDataRef *pemRoots, CFDataRef *untrustedPemRoots) {
+ import "C"
+ import (
+ 	"errors"
++	"io/ioutil"
++	"os"
+ 	"unsafe"
+ )
+ 
+ func loadSystemRoots() (*CertPool, error) {
+ 	roots := NewCertPool()
++	if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
++		data, err := ioutil.ReadFile(file)
++		if err == nil {
++			roots.AppendCertsFromPEM(data)
++			return roots, nil
++		}
++	}
+ 
+ 	var data C.CFDataRef = nil
+ 	var untrustedData C.CFDataRef = nil
+diff --git a/src/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go
+index bc35a1cf21..21e52bec51 100644
+--- a/src/crypto/x509/root_darwin.go
++++ b/src/crypto/x509/root_darwin.go
+@@ -81,18 +81,26 @@ func execSecurityRoots() (*CertPool, error) {
+ 		)
+ 	}
+ 
+-	cmd := exec.Command("/usr/bin/security", args...)
+-	data, err := cmd.Output()
+-	if err != nil {
+-		return nil, err
+-	}
+-
+ 	var (
+ 		mu          sync.Mutex
+ 		roots       = NewCertPool()
+ 		numVerified int // number of execs of 'security verify-cert', for debug stats
+ 	)
+ 
++	if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
++		data, err := ioutil.ReadFile(file)
++		if err == nil {
++			roots.AppendCertsFromPEM(data)
++			return roots, nil
++		}
++	}
++
++	cmd := exec.Command("/usr/bin/security", args...)
++	data, err := cmd.Output()
++	if err != nil {
++		return nil, err
++	}
++
+ 	blockCh := make(chan *pem.Block)
+ 	var wg sync.WaitGroup
+ 
+diff --git a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go
+index 65b5a5fdbc..c9c7ac6a74 100644
+--- a/src/crypto/x509/root_unix.go
++++ b/src/crypto/x509/root_unix.go
+@@ -37,6 +37,13 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate
+ 
+ func loadSystemRoots() (*CertPool, error) {
+ 	roots := NewCertPool()
++	if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
++		data, err := ioutil.ReadFile(file)
++		if err == nil {
++			roots.AppendCertsFromPEM(data)
++			return roots, nil
++		}
++	}
+ 
+ 	files := certFiles
+ 	if f := os.Getenv(certFileEnv); f != "" {
diff --git a/pkgs/development/compilers/halvm/2.4.0.nix b/pkgs/development/compilers/halvm/2.4.0.nix
index 8cbed2a865e..24fffcf603c 100644
--- a/pkgs/development/compilers/halvm/2.4.0.nix
+++ b/pkgs/development/compilers/halvm/2.4.0.nix
@@ -20,9 +20,9 @@ stdenv.mkDerivation rec {
     sed -ie 's|ld |${binutils}/bin/ld |g' src/scripts/ldkernel.in
   '';
   configureFlags = stdenv.lib.optional (!enableIntegerSimple) [ "--enable-gmp" ];
-  propagatedNativeBuildInputs = [ (stdenv.lib.getBin alex) (stdenv.lib.getBin happy) ];
+  propagatedNativeBuildInputs = [ alex happy ];
   buildInputs =
-   let haskellPkgs = [ (stdenv.lib.getBin alex) (stdenv.lib.getBin happy) (stdenv.lib.getBin bootPkgs.hscolour) bootPkgs.cabal-install bootPkgs.haddock bootPkgs.hpc
+   let haskellPkgs = [ alex happy bootPkgs.hscolour bootPkgs.cabal-install bootPkgs.haddock bootPkgs.hpc
     ]; in [ bootPkgs.ghc
             automake perl git binutils
             autoconf xen zlib ncurses.dev
diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix
index 9e5bccff355..11a9a46c15e 100644
--- a/pkgs/development/compilers/llvm/4/default.nix
+++ b/pkgs/development/compilers/llvm/4/default.nix
@@ -1,4 +1,8 @@
-{ lowPrio, newScope, stdenv, cmake, libxml2, python2, isl, fetchurl, overrideCC, wrapCC, darwin, ccWrapperFun }:
+{ lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook
+, libxml2, python2, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun
+, darwin
+}:
+
 let
   callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
 
@@ -46,7 +50,12 @@ let
       extraPackages = [ self.libcxx self.libcxxabi ];
     };
 
-    stdenv = overrideCC stdenv self.clang;
+    stdenv = stdenv.override (drv: {
+      allowedRequisites = null;
+      cc = self.clang;
+      # Use the gcc libstdc++ when targeting linux.
+      extraBuildInputs = if stdenv.cc.isGNU then [ libstdcxxHook ] else drv.extraBuildInputs;
+    });
 
     libcxxStdenv = overrideCC stdenv self.libcxxClang;
 
@@ -58,4 +67,5 @@ let
 
     libcxxabi = callPackage ./libc++abi.nix {};
   };
+
 in self
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 25054d65e29..cdb15fd9f81 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -862,7 +862,6 @@ self: super: {
   # Don't install internal mkReadme tool.
   hastache = overrideCabal super.hastache (drv: {
     doCheck = false;
-    enableSeparateBinOutput = false;
     postInstall = "rm $out/bin/mkReadme && rmdir $out/bin";
   });
 
@@ -900,8 +899,4 @@ self: super: {
     sha256 = "1vss7b99zrhw3r29krl1b60r4qk0m2mpwmrz8q8zdxrh33hb8pd7";
   });
 
-  # Has extra data files which are referred to from the binary output,
-  # creating a store reference cycle. Putting data in separate output
-  # solves the problem.
-  happy = overrideCabal super.happy (drv: { enableSeparateDataOutput = true; });
 }
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 7ba056148ed..28e7532f1c4 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -37,7 +37,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 9.2
+  # LTS Haskell 9.3
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -57,7 +57,7 @@ default-package-overrides:
   - aeson-diff ==1.1.0.3
   - aeson-extra ==0.4.0.0
   - aeson-generic-compat ==0.0.1.0
-  - aeson-injector ==1.0.8.0
+  - aeson-injector ==1.0.10.0
   - aeson-lens ==0.5.0.0
   - aeson-pretty ==0.8.5
   - aeson-qq ==0.8.2
@@ -66,7 +66,7 @@ default-package-overrides:
   - airship ==0.6.0
   - alarmclock ==0.4.0.3
   - alerta ==0.1.0.4
-  - alex ==3.2.1
+  - alex ==3.2.2
   - algebraic-graphs ==0.0.5
   - alsa-core ==0.5.0.1
   - alsa-mixer ==0.2.0.3
@@ -201,7 +201,7 @@ default-package-overrides:
   - attoparsec-binary ==0.2
   - attoparsec-expr ==0.1.1.2
   - attoparsec-iso8601 ==1.0.0.0
-  - attoparsec-time ==0.1.3.2
+  - attoparsec-time ==0.1.4
   - audacity ==0.0.1.2
   - authenticate ==1.3.3.2
   - authenticate-oauth ==1.6
@@ -352,7 +352,7 @@ default-package-overrides:
   - cgi ==3001.3.0.2
   - ChannelT ==0.0.0.4
   - charset ==0.3.7.1
-  - charsetdetect-ae ==1.1.0.2
+  - charsetdetect-ae ==1.1.0.3
   - Chart ==1.8.2
   - Chart-cairo ==1.8.2
   - Chart-diagrams ==1.8.2
@@ -504,7 +504,7 @@ default-package-overrides:
   - data-diverse-lens ==0.1.1.0
   - data-dword ==0.3.1.1
   - data-endian ==0.1.1
-  - data-fix ==0.0.4
+  - data-fix ==0.0.6
   - data-has ==0.2.1.0
   - data-hash ==0.2.0.1
   - data-inttrie ==0.1.2
@@ -561,10 +561,10 @@ default-package-overrides:
   - disposable ==0.2.0.4
   - distance ==0.1.0.0
   - distributed-closure ==0.3.4.0
-  - distributed-static ==0.3.7
+  - distributed-static ==0.3.8
   - distribution ==1.1.1.0
   - distributive ==0.5.3
-  - diversity ==0.8.0.2
+  - diversity ==0.8.1.0
   - djinn-ghc ==0.0.2.3
   - djinn-lib ==0.0.1.2
   - dlist ==0.8.0.3
@@ -673,6 +673,7 @@ default-package-overrides:
   - extensible-exceptions ==0.1.1.4
   - extra ==1.5.3
   - extract-dependencies ==0.2.0.1
+  - extractable-singleton ==0.0.1
   - fail ==4.9.0.0
   - farmhash ==0.1.0.5
   - fast-builder ==0.0.0.6
@@ -711,7 +712,7 @@ default-package-overrides:
   - flexible-defaults ==0.0.1.2
   - floatshow ==0.2.4
   - flock ==0.3.1.8
-  - flow ==1.0.8
+  - flow ==1.0.9
   - fmlist ==0.9
   - fmt ==0.3.0.0
   - fn ==0.3.0.1
@@ -760,7 +761,7 @@ default-package-overrides:
   - getopt-generics ==0.13.0.1
   - ghc-events ==0.6.0
   - ghc-exactprint ==0.5.5.0
-  - ghc-heap-view ==0.5.9
+  - ghc-heap-view ==0.5.10
   - ghc-paths ==0.1.0.9
   - ghc-prof ==1.4.0.2
   - ghc-syb-utils ==0.2.3.2
@@ -789,7 +790,7 @@ default-package-overrides:
   - giphy-api ==0.5.2.0
   - git ==0.2.0
   - github ==0.16.0
-  - github-release ==1.0.5
+  - github-release ==1.0.6
   - github-types ==0.2.1
   - github-webhook-handler ==0.0.8
   - github-webhook-handler-snap ==0.0.7
@@ -931,7 +932,7 @@ default-package-overrides:
   - groundhog-sqlite ==0.8
   - groundhog-th ==0.8.0.1
   - group-by-date ==0.1.0.1
-  - grouped-list ==0.2.1.2
+  - grouped-list ==0.2.1.3
   - groupoids ==4.0
   - groups ==0.4.0.0
   - gtk ==0.14.6
@@ -961,7 +962,7 @@ default-package-overrides:
   - happstack-jmacro ==7.0.12
   - happstack-server ==7.4.6.4
   - happstack-server-tls ==7.1.6.4
-  - happy ==1.19.5
+  - happy >1.19.6
   - harp ==0.4.2
   - hasbolt ==0.1.2.1
   - hashable ==1.2.6.1
@@ -1081,7 +1082,7 @@ default-package-overrides:
   - hruby ==0.3.4.4
   - hs-bibutils ==5.5
   - hs-GeoIP ==0.3
-  - hsass ==0.4.1
+  - hsass ==0.4.2
   - hsb2hs ==0.3.1
   - hscolour ==1.24.1
   - hscurses ==1.4.2.0
@@ -1254,14 +1255,14 @@ default-package-overrides:
   - jmacro-rpc-snap ==0.3
   - jni ==0.3.1
   - jose ==0.6.0.3
-  - jose-jwt ==0.7.6
+  - jose-jwt ==0.7.7
   - js-flot ==0.8.3
   - js-jquery ==3.2.1
   - json ==0.9.1
   - json-builder ==0.3
   - json-rpc-generic ==0.2.1.2
   - json-schema ==0.7.4.1
-  - json-stream ==0.4.1.3
+  - json-stream ==0.4.1.4
   - JuicyPixels ==3.2.8.3
   - JuicyPixels-extra ==0.2.1
   - JuicyPixels-scale-dct ==0.1.1.2
@@ -1281,7 +1282,7 @@ default-package-overrides:
   - koofr-client ==1.0.0.3
   - kraken ==0.0.3
   - l10n ==0.1.0.1
-  - labels ==0.3.2
+  - labels ==0.3.3
   - lackey ==0.4.3
   - lame ==0.1.1
   - language-c ==0.6.1
@@ -1434,6 +1435,7 @@ default-package-overrides:
   - model ==0.3
   - modify-fasta ==0.8.2.3
   - monad-control ==1.0.2.2
+  - monad-control-aligned ==0.0.1
   - monad-coroutine ==0.9.0.3
   - monad-extras ==0.6.0
   - monad-http ==0.1.0.0
@@ -1488,7 +1490,7 @@ default-package-overrides:
   - mysql ==0.1.4
   - mysql-haskell ==0.8.0.0
   - mysql-haskell-openssl ==0.8.0.0
-  - mysql-simple ==0.4.0.1
+  - mysql-simple ==0.4.1.0
   - nagios-check ==0.3.2
   - names-th ==0.2.0.3
   - nano-erl ==0.1.0.1
@@ -1534,7 +1536,7 @@ default-package-overrides:
   - non-negative ==0.1.1.2
   - nonce ==1.0.4
   - nondeterminism ==1.4
-  - NoTrace ==0.3.0.1
+  - NoTrace ==0.3.0.2
   - nsis ==0.3.1
   - numbers ==3000.2.0.1
   - numeric-extras ==0.1
@@ -1825,10 +1827,10 @@ default-package-overrides:
   - regex-tdfa-text ==1.0.0.3
   - regex-with-pcre ==1.0.1.3
   - reinterpret-cast ==0.1.0
-  - relational-query ==0.9.4.1
-  - relational-query-HDBC ==0.6.4.0
+  - relational-query ==0.9.5.0
+  - relational-query-HDBC ==0.6.4.1
   - relational-record ==0.1.8.0
-  - relational-schemas ==0.1.4.0
+  - relational-schemas ==0.1.4.1
   - renderable ==0.2.0.1
   - RepLib ==0.5.4
   - repline ==0.1.6.0
@@ -1878,7 +1880,7 @@ default-package-overrides:
   - scalpel-core ==0.5.1
   - scanner ==0.2
   - schematic ==0.1.6.0
-  - scientific ==0.3.5.1
+  - scientific ==0.3.5.2
   - scotty ==0.11.0
   - scrape-changes ==0.1.0.5
   - scrypt ==0.5.0
@@ -1910,14 +1912,14 @@ default-package-overrides:
   - servant-cassava ==0.9
   - servant-checked-exceptions ==0.4.0.0
   - servant-client ==0.11
-  - servant-docs ==0.10.0.1
+  - servant-docs ==0.11
   - servant-elm ==0.4.0.1
   - servant-foreign ==0.10.1
   - servant-js ==0.9.3
   - servant-JuicyPixels ==0.3.0.3
   - servant-lucid ==0.7.1
   - servant-mock ==0.8.2
-  - servant-purescript ==0.8.0.0
+  - servant-purescript ==0.8.0.1
   - servant-ruby ==0.2.1.0
   - servant-server ==0.11
   - servant-static-th ==0.1.0.5
@@ -2039,7 +2041,7 @@ default-package-overrides:
   - storable-tuple ==0.0.3.2
   - storablevector ==0.2.12.1
   - storablevector-carray ==0.0
-  - store ==0.4.3.1
+  - store ==0.4.3.2
   - store-core ==0.4.1
   - Strafunski-StrategyLib ==5.0.0.10
   - stratosphere ==0.6.0
@@ -2179,7 +2181,7 @@ default-package-overrides:
   - thread-local-storage ==0.1.1
   - threads ==0.5.1.5
   - threepenny-editors ==0.4.1
-  - threepenny-gui ==0.8.0.1
+  - threepenny-gui ==0.8.1.0
   - threepenny-gui-flexbox ==0.4.2
   - through-text ==0.1.0.0
   - throwable-exceptions ==0.1.0.8
@@ -2289,7 +2291,7 @@ default-package-overrides:
   - uri-bytestring ==0.2.3.3
   - uri-bytestring-aeson ==0.1.0.2
   - uri-encode ==1.5.0.5
-  - uri-templater ==0.2.1.0
+  - uri-templater ==0.2.2.0
   - url ==2.1.3
   - urlpath ==5.0.0.1
   - users ==0.5.0.0
@@ -2343,7 +2345,7 @@ default-package-overrides:
   - wai-middleware-caching-lru ==0.1.0.0
   - wai-middleware-caching-redis ==0.2.0.0
   - wai-middleware-consul ==0.1.0.2
-  - wai-middleware-content-type ==0.5.0.1
+  - wai-middleware-content-type ==0.5.1
   - wai-middleware-crowd ==0.1.4.2
   - wai-middleware-metrics ==0.2.4
   - wai-middleware-rollbar ==0.4.0
@@ -2452,15 +2454,15 @@ default-package-overrides:
   - yackage ==0.8.1
   - yahoo-finance-api ==0.2.0.2
   - yaml ==0.8.23.3
-  - Yampa ==0.10.6.1
+  - Yampa ==0.10.6.2
   - YampaSynth ==0.2
   - yes-precure5-command ==5.5.3
   - yesod ==1.4.5
-  - yesod-auth ==1.4.17.3
+  - yesod-auth ==1.4.18
   - yesod-auth-account ==1.4.3
   - yesod-auth-basic ==0.1.0.2
   - yesod-auth-fb ==1.8.1
-  - yesod-auth-hashdb ==1.6.1
+  - yesod-auth-hashdb ==1.6.2
   - yesod-bin ==1.5.2.5
   - yesod-core ==1.4.36
   - yesod-default ==1.2.0
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index c1813cad7a9..36f5f28f2f8 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -211,10 +211,7 @@ self: super: builtins.intersectAttrs super {
 
   # wxc supports wxGTX >= 3.0, but our current default version points to 2.8.
   # http://hydra.cryp.to/build/1331287/log/raw
-  wxc = (overrideCabal super.wxc (drv: {
-      buildDepends = (drv.buildDepends or []) ++ [self.split];
-      postInstall = "cp -v dist/build/libwxc.so.0.92.3.0 $lib/lib/libwxc.so";
-    })).override { wxGTK = pkgs.wxGTK30; };
+  wxc = (addBuildDepend super.wxc self.split).override { wxGTK = pkgs.wxGTK30; };
   wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK30; };
 
   # Test suite wants to connect to $DISPLAY.
@@ -492,46 +489,4 @@ self: super: builtins.intersectAttrs super {
   # Without this override, the builds lacks pkg-config.
   opencv-extra = addPkgconfigDepend super.opencv-extra (pkgs.opencv3.override { enableContrib = true; });
 
-  # Alex has some weird files in /usr/share that create a cyclic ref with
-  # its bin dir.
-  alex = hasNoBinOutput super.alex;
-
-  # Disable separate bin outputs for these specific packages that break with it.
-  H = hasNoBinOutput super.H;
-  cryptol = hasNoBinOutput super.cryptol;
-  sproxy = hasNoBinOutput super.sproxy;
-  sproxy2 = hasNoBinOutput super.sproxy2;
-  sproxy-web = hasNoBinOutput super.sproxy-web;
-  juandelacosa = hasNoBinOutput super.juandelacosa;
-  mywatch = hasNoBinOutput super.mywatch;
-  sugarhaskell = hasNoBinOutput super.sugarhaskell;
-  zerobin = hasNoBinOutput super.zerobin;
-
-  git-annex = overrideCabal super.git-annex (drv: {
-    enableSeparateBinOutput = false;
-    enableSeparateEtcOutput = false;
-  });
-
-  # Override a number of packages with specific references to $out in their
-  # derivations
-  stack = overrideCabal super.stack (drv: {
-    postInstall = ''
-      exe=$bin/bin/stack
-      mkdir -p $bin/share/bash-completion/completions
-      $exe --bash-completion-script $exe >$bin/share/bash-completion/completions/stack
-    '';
-  });
-  Agda = overrideCabal super.Agda (drv: {
-    postInstall = ''
-      files=("$out/share/"*"-ghc-"*"/Agda-"*"/lib/prim/Agda/"{Primitive.agda,Builtin"/"*.agda})
-      for f in "''${files[@]}" ; do
-        $bin/bin/agda $f
-      done
-      for f in "''${files[@]}" ; do
-        $bin/bin/agda -c --no-main $f
-      done
-      $bin/bin/agda-mode compile
-    '';
-  });
-
 }
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index d49f3112923..60cce56cca0 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -56,10 +56,6 @@ let isCross = (ghc.cross or null) != null; in
 , hardeningDisable ? lib.optional (ghc.isHaLVM or false) "all"
 , enableSeparateDataOutput ? false
 , enableSeparateDocOutput ? doHaddock
-, enableSeparateBinOutput ? isExecutable
-, outputsToInstall ? []
-, enableSeparateLibOutput ? true
-, enableSeparateEtcOutput ? (stdenv.lib.versionOlder "7.7" ghc.version)
 } @ args:
 
 assert editedCabalFile != null -> revision != null;
@@ -83,6 +79,9 @@ let
                         then "package-db"
                         else "package-conf";
 
+  # the target dir for haddock documentation
+  docdir = docoutput: docoutput + "/share/doc";
+
   newCabalFileUrl = "http://hackage.haskell.org/package/${pname}-${version}/revision/${revision}.cabal";
   newCabalFile = fetchurl {
     url = newCabalFileUrl;
@@ -96,13 +95,6 @@ let
                    '';
 
   hasActiveLibrary = isLibrary && (enableStaticLibraries || enableSharedLibraries || enableLibraryProfiling);
-  hasLibOutput = enableSeparateLibOutput && hasActiveLibrary;
-  libDir = if hasLibOutput then "$lib/lib/${ghc.name}" else "$out/lib/${ghc.name}";
-  binDir = if enableSeparateBinOutput then "$bin/bin" else "$out/bin";
-  libexecDir = if enableSeparateBinOutput then "$libexec/bin" else "$out/libexec";
-  etcDir = if enableSeparateEtcOutput then "$etc/etc" else "$out/etc";
-  docDir = if enableSeparateDocOutput then "$doc/share/doc" else "$out/share/doc";
-  dataDir = if enableSeparateDataOutput then "$data/share/${ghc.name}" else "$out/share/${ghc.name}";
 
   # We cannot enable -j<n> parallelism for libraries because GHC is far more
   # likely to generate a non-determistic library ID in that case. Further
@@ -121,20 +113,12 @@ let
     stdenv.lib.optionalString isCross (" " + stdenv.lib.concatStringsSep " " crossCabalFlags);
 
   defaultConfigureFlags = [
-    "--verbose" "--prefix=$out"
-    # Binary directory has to be $bin/bin instead of just $bin: this
-    # is so that the package is added to the PATH when it's used as a
-    # build input. Sadly mkDerivation won't add inputs that don't have
-    # bin subdirectory.
-    "--bindir=${binDir}"
-    "--libdir=${libDir}" "--libsubdir=\\$pkgid"
-    "--libexecdir=${libexecDir}"
-    (optionalString (enableSeparateEtcOutput) "--sysconfdir=${etcDir}") # Old versions of cabal don't support this flag.
-    "--datadir=${dataDir}"
-    "--docdir=${docDir}"
+    "--verbose" "--prefix=$out" "--libdir=\\$prefix/lib/\\$compiler" "--libsubdir=\\$pkgid"
+    (optionalString enableSeparateDataOutput "--datadir=$data/share/${ghc.name}")
+    (optionalString enableSeparateDocOutput "--docdir=${docdir "$doc"}")
     "--with-gcc=$CC" # Clang won't work without that extra information.
     "--package-db=$packageConfDir"
-    (optionalString (enableSharedExecutables && stdenv.isLinux) "--ghc-option=-optl=-Wl,-rpath=${libDir}/${pname}-${version}")
+    (optionalString (enableSharedExecutables && stdenv.isLinux) "--ghc-option=-optl=-Wl,-rpath=$out/lib/${ghc.name}/${pname}-${version}")
     (optionalString (enableSharedExecutables && stdenv.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names")
     (optionalString enableParallelBuilding "--ghc-option=-j$NIX_BUILD_CORES")
     (optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp")
@@ -168,8 +152,7 @@ let
   allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++
                         optionals doCheck testPkgconfigDepends ++ optionals withBenchmarkDepends benchmarkPkgconfigDepends;
 
-  nativeBuildInputs = map stdenv.lib.getBin
-    (buildTools ++ libraryToolDepends ++ executableToolDepends ++ [ removeReferencesTo ]);
+  nativeBuildInputs = buildTools ++ libraryToolDepends ++ executableToolDepends ++ [ removeReferencesTo ];
   propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends;
   otherBuildInputs = setupHaskellDepends ++ extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++
                      optionals (allPkgconfigDepends != []) ([pkgconfig] ++ allPkgconfigDepends) ++
@@ -198,15 +181,7 @@ assert allPkgconfigDepends != [] -> pkgconfig != null;
 stdenv.mkDerivation ({
   name = "${pname}-${version}";
 
-  outputs = if (args ? outputs) then args.outputs else
-    (  (optional enableSeparateBinOutput "bin")
-    ++ (optional enableSeparateBinOutput "libexec")
-    ++ [ "out" ]
-    ++ (optional enableSeparateDataOutput "data")
-    ++ (optional enableSeparateDocOutput "doc")
-    ++ (optional enableSeparateEtcOutput "etc")
-    ++ (optional hasLibOutput "lib")
-    );
+  outputs = if (args ? outputs) then args.outputs else ([ "out" ] ++ (optional enableSeparateDataOutput "data") ++ (optional enableSeparateDocOutput "doc"));
   setOutputFlags = false;
 
   pos = builtins.unsafeGetAttrPos "pname" args;
@@ -230,7 +205,7 @@ stdenv.mkDerivation ({
 
   postPatch = optionalString jailbreak ''
     echo "Run jailbreak-cabal to lift version restrictions on build inputs."
-    ${stdenv.lib.getBin jailbreak-cabal}/bin/jailbreak-cabal ${pname}.cabal
+    ${jailbreak-cabal}/bin/jailbreak-cabal ${pname}.cabal
   '' + postPatch;
 
   setupCompilerEnvironmentPhase = ''
@@ -238,7 +213,7 @@ stdenv.mkDerivation ({
 
     echo "Build with ${ghc}."
     export PATH="${ghc}/bin:$PATH"
-    ${optionalString (hasActiveLibrary && hyperlinkSource) "export PATH=${stdenv.lib.getBin hscolour}/bin:$PATH"}
+    ${optionalString (hasActiveLibrary && hyperlinkSource) "export PATH=${hscolour}/bin:$PATH"}
 
     packageConfDir="$TMPDIR/package.conf.d"
     mkdir -p $packageConfDir
@@ -265,7 +240,7 @@ stdenv.mkDerivation ({
     #
     # Create a local directory with symlinks of the *.dylib (macOS shared
     # libraries) from all the dependencies.
-    local dynamicLinksDir="${libDir}/links"
+    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
@@ -337,7 +312,7 @@ stdenv.mkDerivation ({
 
     ${if !hasActiveLibrary then "${setupCommand} install" else ''
       ${setupCommand} copy
-      local packageConfDir="${libDir}/package.conf.d"
+      local packageConfDir="$out/lib/${ghc.name}/package.conf.d"
       local packageConfFile="$packageConfDir/${pname}-${version}.conf"
       mkdir -p "$packageConfDir"
       ${setupCommand} register --gen-pkg-config=$packageConfFile
@@ -345,7 +320,7 @@ stdenv.mkDerivation ({
       mv $packageConfFile $packageConfDir/$pkgId.conf
     ''}
     ${optionalString isGhcjs ''
-      for exeDir in "${binDir}/"*.jsexe; do
+      for exeDir in "$out/bin/"*.jsexe; do
         exe="''${exeDir%.jsexe}"
         printWords '#!${nodejs}/bin/node' > "$exe"
         cat "$exeDir/all.js" >> "$exe"
@@ -354,68 +329,18 @@ stdenv.mkDerivation ({
     ''}
     ${optionalString doCoverage "mkdir -p $out/share && cp -r dist/hpc $out/share"}
     ${optionalString (enableSharedExecutables && isExecutable && !isGhcjs && stdenv.isDarwin && stdenv.lib.versionOlder ghc.version "7.10") ''
-      for exe in "${binDir}/"* ; do
-        install_name_tool -add_rpath "${libDir}/${pname}-${version}" "$exe"
+      for exe in "$out/bin/"* ; do
+        install_name_tool -add_rpath "$out/lib/ghc-${ghc.version}/${pname}-${version}" "$exe"
       done
     ''}
 
     ${optionalString enableSeparateDocOutput ''
-    # Remove references back to $out but also back to $lib if we have
-    # docs. $lib is needed as it stores path to haddock interfaces in the
-    # conf file which creates a cycle if docs refer back to library
-    # path.
-    mkdir -p ${docDir}
-
-    for x in ${docDir}/html/src/*.html; do
-      remove-references-to -t $out -t ${libDir} -t ${binDir} ${optionalString enableSeparateDataOutput "-t $data"} $x
+    for x in ${docdir "$doc"}/html/src/*.html; do
+      remove-references-to -t $out $x
     done
+    mkdir -p $doc
     ''}
-
-    ${optionalString hasLibOutput ''
-    # Even if we don't have binary output for the package, things like
-    # Paths files will embed paths to bin/libexec directories in themselves
-    # which results in .lib <-> $out cyclic store reference. We
-    # therefore patch out the paths from separate library if we don't have
-    # separate bin output too.
-    #
-    # If we _do_ have separate bin and lib outputs, we may still be in
-    # trouble in case of shared executables: executable contains path to
-    # .lib, .lib contains path (through Paths) to .bin and we have a
-    # cycle.
-    #
-    # Lastly we have to deal with references from .lib back into
-    # $out/share if we're not splitting out data directory.
-    #
-    # It may happen that we have hasLibOutput set but the library
-    # directory was not created: this happens in the case that library
-    # section is not exposing any modules. See "fail" package for an
-    # example where no modules are exposed for GHC >= 8.0.
-    if [ -d ${libDir} ]; then
-      find ${libDir} -type f -exec \
-        remove-references-to -t ${binDir} -t ${libexecDir} "{}" \;
-    fi
-    ''}
-
-    ${optionalString (hasLibOutput && ! enableSeparateDocOutput) ''
-    # If we don't have separate docs, we have to patch out the ref to
-    # docs in package conf. This will likely break Haddock
-    # cross-package links but is necessary to break store cycle…
-    find ${libDir}/ -type f -name '*.conf' -exec \
-      remove-references-to -t ${docDir} "{}" \;
-    ''}
-
-    ${optionalString (hasLibOutput && ! enableSeparateDataOutput) ''
-    # Just like for doc output path in $out potentially landing in
-    # *.conf, we have to also remove the data directory so that it
-    # doesn't appear under data-dir field creating a cycle.
-    find ${libDir}/ -type f -exec echo Removing ${dataDir} refs from "{}" \;
-    find ${libDir}/ -type f -exec \
-      remove-references-to -t ${dataDir} "{}" \;
-    ''}
-
-    ${optionalString enableSeparateDataOutput "mkdir -p ${dataDir}"}
-    ${optionalString enableSeparateBinOutput "mkdir -p ${binDir} ${libexecDir}"}
-    ${optionalString enableSeparateEtcOutput "mkdir -p ${etcDir}"}
+    ${optionalString enableSeparateDataOutput "mkdir -p $data"}
 
     runHook postInstall
   '';
@@ -432,7 +357,7 @@ stdenv.mkDerivation ({
     # the directory containing the haddock documentation.
     # `null' if no haddock documentation was built.
     # TODO: fetch the self from the fixpoint instead
-    haddockDir = self: if doHaddock then "${docDir}/html" else null;
+    haddockDir = self: if doHaddock then "${docdir self.doc}/html" else null;
 
     env = stdenv.mkDerivation {
       name = "interactive-${pname}-${version}-environment";
@@ -461,7 +386,6 @@ stdenv.mkDerivation ({
          // optionalAttrs (description != "")  { inherit description; }
          // optionalAttrs (maintainers != [])  { inherit maintainers; }
          // optionalAttrs (hydraPlatforms != platforms) { inherit hydraPlatforms; }
-         // optionalAttrs (outputsToInstall != []) { inherit outputsToInstall; }
          ;
 
 }
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index f1f0ad98a9e..ba9864d2605 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -12961,19 +12961,6 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "NoTrace";
-       version = "0.3.0.1";
-       sha256 = "0kszrn14jzv27h7s3x1ckskhl5a6ayvr8sq3105sbf9vndharvx8";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base ];
-       homepage = "https://github.com/CindyLinz/Haskell-NoTrace";
-       description = "Remove all the functions come from Debug.Trace after debugging";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "NoTrace_0_3_0_2" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "NoTrace";
        version = "0.3.0.2";
        sha256 = "0nqjjhfycvalva0l660cxgqj793kcsyb75rd3dlp58d2i947isir";
        libraryHaskellDepends = [ base ];
@@ -12981,7 +12968,6 @@ self: {
        homepage = "https://github.com/CindyLinz/Haskell-NoTrace";
        description = "Remove all the functions come from Debug.Trace after debugging";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Noise" = callPackage
@@ -18229,8 +18215,8 @@ self: {
      }:
      mkDerivation {
        pname = "Villefort";
-       version = "0.1.1.11";
-       sha256 = "0pgwaiz6pxdf6yrxx20p5zmj8lr2gx8wiwqwia19cgzcfgpm8hw8";
+       version = "0.1.1.13";
+       sha256 = "02qlhg1i5z9z0zdbczygf4px477zg91a8gk5va5i7mcsgznqzv7d";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -19217,22 +19203,6 @@ self: {
      }) {};
 
   "Yampa" = callPackage
-    ({ mkDerivation, base, deepseq, hcwiid, random, SDL }:
-     mkDerivation {
-       pname = "Yampa";
-       version = "0.10.6.1";
-       sha256 = "108rn0hc5xqw8pmadaddgawxpsznhjg8kbn9m30lwz04hv2ivjrv";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base deepseq random ];
-       executableHaskellDepends = [ base deepseq hcwiid random SDL ];
-       testHaskellDepends = [ base ];
-       homepage = "http://www.haskell.org/haskellwiki/Yampa";
-       description = "Library for programming hybrid systems";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Yampa_0_10_6_2" = callPackage
     ({ mkDerivation, base, deepseq, random }:
      mkDerivation {
        pname = "Yampa";
@@ -19245,7 +19215,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Yampa";
        description = "Library for programming hybrid systems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Yampa-core" = callPackage
@@ -21538,28 +21507,6 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-injector";
-       version = "1.0.8.0";
-       sha256 = "1k5chasmpn834pjhfyfjmkmx7dzxy3bw9rkphk6dmp7kp41ygyai";
-       libraryHaskellDepends = [
-         aeson base bifunctors deepseq lens servant-docs swagger2 text
-         unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson base HUnit lens QuickCheck quickcheck-text scientific
-         swagger2 tasty tasty-hunit tasty-quickcheck text vector
-       ];
-       description = "Injecting fields into aeson values";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "aeson-injector_1_0_10_0" = callPackage
-    ({ mkDerivation, aeson, base, bifunctors, deepseq, HUnit, lens
-     , QuickCheck, quickcheck-text, scientific, servant-docs, swagger2
-     , tasty, tasty-hunit, tasty-quickcheck, text, unordered-containers
-     , vector
-     }:
-     mkDerivation {
-       pname = "aeson-injector";
        version = "1.0.10.0";
        sha256 = "169zdhc3j2lv9hgv6c2s7jxvwb68xkgimkyqp8c7vwr812asqabk";
        libraryHaskellDepends = [
@@ -21572,7 +21519,6 @@ self: {
        ];
        description = "Injecting fields into aeson values";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-iproute" = callPackage
@@ -22334,8 +22280,8 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-distributed";
-       version = "0.7.2";
-       sha256 = "1b18sgnk5ybrfvwqhwixcnwzr7ffi2h93ck75ba9a1r8rkkd193c";
+       version = "0.7.4";
+       sha256 = "0p18s265yf2ficygvgzrngl2ax1zf73h56mz3jv3iigjrsjf4rj2";
        libraryHaskellDepends = [
          aivika aivika-transformers base binary containers
          distributed-process exceptions mtl mwc-random random stm time
@@ -22586,29 +22532,6 @@ self: {
      }) {};
 
   "alex" = callPackage
-    ({ mkDerivation, array, base, Cabal, containers, directory
-     , filepath, happy, process, QuickCheck
-     }:
-     mkDerivation {
-       pname = "alex";
-       version = "3.2.1";
-       sha256 = "0v0f4fvb6gqjrxq6k3r7qxjwy2m9462c92vpbidawkwzfbnggrx4";
-       revision = "1";
-       editedCabalFile = "1nl05l0dkai8i9x9fx288ka010hp6yhy3dmvfhjkqpfakimfcs1s";
-       isLibrary = false;
-       isExecutable = true;
-       setupHaskellDepends = [ base Cabal directory filepath ];
-       executableHaskellDepends = [
-         array base containers directory QuickCheck
-       ];
-       executableToolDepends = [ happy ];
-       testHaskellDepends = [ base process ];
-       homepage = "http://www.haskell.org/alex/";
-       description = "Alex is a tool for generating lexical analysers in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "alex_3_2_2" = callPackage
     ({ mkDerivation, array, base, containers, directory, happy, process
      , QuickCheck
      }:
@@ -22626,7 +22549,6 @@ self: {
        homepage = "http://www.haskell.org/alex/";
        description = "Alex is a tool for generating lexical analysers in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "alex-meta" = callPackage
@@ -28792,13 +28714,15 @@ self: {
      }) {};
 
   "attoparsec-time" = callPackage
-    ({ mkDerivation, attoparsec, base, base-prelude, directory, doctest
-     , filepath, scientific, text, time
+    ({ mkDerivation, attoparsec, base, base-prelude, Cabal
+     , cabal-doctest, directory, doctest, filepath, scientific, text
+     , time
      }:
      mkDerivation {
        pname = "attoparsec-time";
-       version = "0.1.3.2";
-       sha256 = "0p7lzqn9is04gp98278ygbwx1ass7ami32nybx6d9n77iz2habp0";
+       version = "0.1.4";
+       sha256 = "0b4h530j01wkx8405b0yf0cz5k7mjglzr72lvv8rr7idd7m4k5iw";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          attoparsec base base-prelude scientific text time
        ];
@@ -41606,25 +41530,12 @@ self: {
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
        pname = "charsetdetect-ae";
-       version = "1.1.0.2";
-       sha256 = "1ghgp8kqpr5xc14lcwlf450s6s8lm52zag34v9gvr3x86bjgm4qk";
-       libraryHaskellDepends = [ base bytestring ];
-       homepage = "http://github.com/aelve/charsetdetect-ae";
-       description = "Character set detection using Mozilla's Universal Character Set Detector";
-       license = "LGPL";
-     }) {};
-
-  "charsetdetect-ae_1_1_0_3" = callPackage
-    ({ mkDerivation, base, bytestring }:
-     mkDerivation {
-       pname = "charsetdetect-ae";
        version = "1.1.0.3";
        sha256 = "15kf9g708ics81s3gj4vkx4xcvywj2fripf0g9p29v4xliwd9m7y";
        libraryHaskellDepends = [ base bytestring ];
        homepage = "http://github.com/aelve/charsetdetect-ae";
        description = "Character set detection using Mozilla's Universal Character Set Detector";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chart-histogram" = callPackage
@@ -41668,7 +41579,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "chart-unit_0_5_0" = callPackage
+  "chart-unit_0_5_1" = callPackage
     ({ mkDerivation, base, colour, containers, data-default
      , diagrams-lib, diagrams-rasterific, diagrams-svg, foldl
      , formatting, lens, linear, mwc-probability, mwc-random, numhask
@@ -41677,8 +41588,8 @@ self: {
      }:
      mkDerivation {
        pname = "chart-unit";
-       version = "0.5.0";
-       sha256 = "09m543av9wwip64yba3qapf869cafjj03vnl8qfi7rwaf6w94h2a";
+       version = "0.5.1";
+       sha256 = "1hwbhzs22glikckwbbj9y5hn2vdsz3178gdw7hjrb32aa5kxj45j";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -41686,8 +41597,9 @@ self: {
          lens linear numhask numhask-range palette SVGFonts text
        ];
        executableHaskellDepends = [
-         base containers diagrams-lib diagrams-rasterific foldl lens
-         mwc-probability mwc-random numhask primitive protolude tdigest text
+         base containers diagrams-lib diagrams-rasterific diagrams-svg foldl
+         lens mwc-probability mwc-random numhask primitive protolude tdigest
+         text
        ];
        testHaskellDepends = [ base numhask tasty tasty-hspec text ];
        homepage = "https://github.com/tonyday567/chart-unit";
@@ -46702,8 +46614,8 @@ self: {
      }:
      mkDerivation {
        pname = "concrete-haskell-autogen";
-       version = "0.0.0.2";
-       sha256 = "02y9ahcryrhwiam9fsh8r57lri3zhy2xhm6098j9x1zzr2vq72sl";
+       version = "0.0.0.3";
+       sha256 = "0csdzkhw1v84ryzdzfii5iphyyclqf8gl1mh5qvg13jyxvh5z7rk";
        libraryHaskellDepends = [
          base bytestring containers hashable lens QuickCheck text thrift
          unordered-containers vector
@@ -47267,6 +47179,37 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "conduit-extra_1_1_17" = callPackage
+    ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring
+     , bytestring-builder, conduit, criterion, directory, exceptions
+     , filepath, hspec, monad-control, network, primitive, process
+     , QuickCheck, resourcet, stm, streaming-commons, text, transformers
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "conduit-extra";
+       version = "1.1.17";
+       sha256 = "01haq94kf4jsqrhs6j2kkvxrw4iqhvhnd9rcrqpkdbp1dil493kn";
+       libraryHaskellDepends = [
+         async attoparsec base blaze-builder bytestring conduit directory
+         exceptions filepath monad-control network primitive process
+         resourcet stm streaming-commons text transformers transformers-base
+       ];
+       testHaskellDepends = [
+         async attoparsec base blaze-builder bytestring bytestring-builder
+         conduit directory exceptions hspec process QuickCheck resourcet stm
+         streaming-commons text transformers transformers-base
+       ];
+       benchmarkHaskellDepends = [
+         base blaze-builder bytestring bytestring-builder conduit criterion
+         transformers
+       ];
+       homepage = "http://github.com/snoyberg/conduit";
+       description = "Batteries included conduit: adapters for common libraries";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "conduit-find" = callPackage
     ({ mkDerivation, attoparsec, base, conduit, conduit-combinators
      , conduit-extra, directory, doctest, either, exceptions, filepath
@@ -47392,6 +47335,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "conduit-throttle" = callPackage
+    ({ mkDerivation, async, base, conduit, conduit-combinators
+     , conduit-extra, HUnit, resourcet, stm, stm-chans, stm-conduit
+     , test-framework, test-framework-hunit, throttle-io-stream
+     , unliftio, unliftio-core
+     }:
+     mkDerivation {
+       pname = "conduit-throttle";
+       version = "0.2.0.1";
+       sha256 = "0402bnj5z4m2lqgagbw8rc7c8vmm3sldp1vcrywd5zvcp5031xsa";
+       libraryHaskellDepends = [
+         async base conduit conduit-combinators conduit-extra resourcet stm
+         stm-chans throttle-io-stream unliftio unliftio-core
+       ];
+       testHaskellDepends = [
+         async base conduit conduit-combinators conduit-extra HUnit
+         resourcet stm stm-chans stm-conduit test-framework
+         test-framework-hunit throttle-io-stream unliftio unliftio-core
+       ];
+       homepage = "https://github.com/mtesseract/conduit-throttle#readme";
+       description = "Throttle Conduit Producers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "conduit-tokenize-attoparsec" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, conduit, hspec
      , resourcet, text
@@ -49269,8 +49236,8 @@ self: {
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "counter";
-       version = "0.1.0.1";
-       sha256 = "0pfg34ph6b7qb3wscvvnqdkqqzkjdjc8wynv35ikgf295bsf3kaz";
+       version = "0.1.0.2";
+       sha256 = "0jc34nrbzxzilrr1s2k7krrp9g5xc40hpf2srw6mccfrcsyacsnc";
        libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/wei2912/counter";
        description = "An object frequency counter";
@@ -51956,6 +51923,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "curryer" = callPackage
+    ({ mkDerivation, aeson, base, blaze-html, bytestring
+     , case-insensitive, containers, cookie, http-types, mtl, regex-pcre
+     , text, transformers, wai, warp
+     }:
+     mkDerivation {
+       pname = "curryer";
+       version = "0.1.0.0";
+       sha256 = "16g66p8hpw1i9ah3isw92mxjj04b8plvz1kqf7k298yqkgcyadmg";
+       libraryHaskellDepends = [
+         aeson base blaze-html bytestring case-insensitive containers cookie
+         http-types mtl regex-pcre text transformers wai warp
+       ];
+       homepage = "https://github.com/ChrisPenner/curryer#readme";
+       description = "A simple HTTP server framework";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "curryrs" = callPackage
     ({ mkDerivation, base, mtl, tasty, tasty-hunit }:
      mkDerivation {
@@ -53528,22 +53513,20 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "data-fix";
-       version = "0.0.4";
-       sha256 = "1446gvgq5xfsixcm63fyi4qv15kqxdfw2b2bzwm3q303n0xd5ql5";
-       revision = "1";
-       editedCabalFile = "1y2rimg0wpvk6sgc30csz211220im5dm7zzm86yqyx9b3yxzk177";
+       version = "0.0.6";
+       sha256 = "10shw0c7c3v3qy27c8mahr56bzciikqmafpm01r7792i84glb10g";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/anton-k/data-fix";
        description = "Fixpoint data types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "data-fix_0_0_6" = callPackage
+  "data-fix_0_0_7" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "data-fix";
-       version = "0.0.6";
-       sha256 = "10shw0c7c3v3qy27c8mahr56bzciikqmafpm01r7792i84glb10g";
+       version = "0.0.7";
+       sha256 = "04k9cmb197majyw6xna8zfkhgfyxfdiz2sgb0jy5jyfpiz3cr60h";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/anton-k/data-fix";
        description = "Fixpoint data types";
@@ -59358,22 +59341,6 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-static";
-       version = "0.3.7";
-       sha256 = "0aalqhk4d2qbkcxnjn5jnp8m2kbvvl6dm49psfgzpmaixbd6wr45";
-       libraryHaskellDepends = [
-         base binary bytestring containers deepseq rank1dynamic
-       ];
-       homepage = "http://haskell-distributed.github.com";
-       description = "Compositional, type-safe, polymorphic static values and closures";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "distributed-static_0_3_8" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, deepseq
-     , rank1dynamic
-     }:
-     mkDerivation {
-       pname = "distributed-static";
        version = "0.3.8";
        sha256 = "1hpzsjwmmaj3cj4i54mg6g9dkk6vgwda66y8j14pjqmn49bzcjwm";
        libraryHaskellDepends = [
@@ -59382,7 +59349,6 @@ self: {
        homepage = "http://haskell-distributed.github.com";
        description = "Compositional, type-safe, polymorphic static values and closures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distribution" = callPackage
@@ -59464,29 +59430,6 @@ self: {
      }:
      mkDerivation {
        pname = "diversity";
-       version = "0.8.0.2";
-       sha256 = "093k1i3dikfwaswiahs6rzn304l7xh9c3vshy5lr3zwajl8aggpq";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers data-ordlist fasta math-functions MonadRandom
-         parsec random-shuffle scientific split
-       ];
-       executableHaskellDepends = [
-         base containers fasta optparse-applicative pipes semigroups
-       ];
-       homepage = "https://github.com/GregorySchwartz/diversity";
-       description = "Quantify the diversity of a population";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "diversity_0_8_1_0" = callPackage
-    ({ mkDerivation, base, containers, data-ordlist, fasta
-     , math-functions, MonadRandom, optparse-applicative, parsec, pipes
-     , random-shuffle, scientific, semigroups, split
-     }:
-     mkDerivation {
-       pname = "diversity";
        version = "0.8.1.0";
        sha256 = "0ci864ki4hfrm4g82xbqhmkcvvifglrwf8ljjbawk32wpmz15yqv";
        isLibrary = true;
@@ -59501,7 +59444,6 @@ self: {
        homepage = "https://github.com/GregorySchwartz/diversity";
        description = "Quantify the diversity of a population";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dixi" = callPackage
@@ -59777,6 +59719,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dns_2_0_13" = callPackage
+    ({ mkDerivation, attoparsec, base, binary, bytestring
+     , bytestring-builder, conduit, conduit-extra, containers, doctest
+     , hspec, iproute, mtl, network, random, resourcet, safe, word8
+     }:
+     mkDerivation {
+       pname = "dns";
+       version = "2.0.13";
+       sha256 = "0rrv49rvnpd1pf37imhm82ngy9z0vk80sz0zvikpccc0parbmvx0";
+       libraryHaskellDepends = [
+         attoparsec base binary bytestring conduit conduit-extra containers
+         iproute mtl network random resourcet safe
+       ];
+       testHaskellDepends = [
+         attoparsec base binary bytestring bytestring-builder conduit
+         conduit-extra containers doctest hspec iproute mtl network random
+         resourcet safe word8
+       ];
+       testTarget = "spec";
+       description = "DNS library in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dnscache" = callPackage
     ({ mkDerivation, base, bytestring, containers, contstuff, dns
      , iproute, time
@@ -67181,8 +67147,8 @@ self: {
      }:
      mkDerivation {
        pname = "factory";
-       version = "0.2.2.1";
-       sha256 = "15x5ki7rpmsy84b5qbzhr0ih0gal75rj7ddqi7h7m5q33zl114b0";
+       version = "0.3.0.0";
+       sha256 = "0izhwb0plxhlsr4ghk2rybm367n83d598s3nk8ss0mnnv7gv5wpm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -69497,8 +69463,8 @@ self: {
      }:
      mkDerivation {
        pname = "fishfood";
-       version = "0.0.1.6";
-       sha256 = "01fyncr5ymkm6s200xj76sh1slqhyf840sr0klj0a2s8i0madk25";
+       version = "0.0.1.7";
+       sha256 = "1b2nabliv1xqi42q2bknri85gizb1xbh7j5729dxv3sybzq50wd8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -70363,19 +70329,6 @@ self: {
     ({ mkDerivation, base, doctest, QuickCheck, template-haskell }:
      mkDerivation {
        pname = "flow";
-       version = "1.0.8";
-       sha256 = "13cfwc67r38kx30yixizcifcgijm7ak2swr3qikdb44fjm5y0zas";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base doctest QuickCheck template-haskell ];
-       homepage = "https://github.com/tfausak/flow#readme";
-       description = "Write more understandable Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "flow_1_0_9" = callPackage
-    ({ mkDerivation, base, doctest, QuickCheck, template-haskell }:
-     mkDerivation {
-       pname = "flow";
        version = "1.0.9";
        sha256 = "1rqljbq4s9swh19r57gpp3nzxwgwa1j0q53m971i455wq1xszx1m";
        libraryHaskellDepends = [ base ];
@@ -70383,7 +70336,6 @@ self: {
        homepage = "https://github.com/tfausak/flow#readme";
        description = "Write more understandable Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flow-er" = callPackage
@@ -70889,7 +70841,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "foldl_1_3_0" = callPackage
+  "foldl_1_3_1" = callPackage
     ({ mkDerivation, base, bytestring, comonad, containers
      , contravariant, criterion, hashable, mwc-random, primitive
      , profunctors, text, transformers, unordered-containers, vector
@@ -70897,8 +70849,8 @@ self: {
      }:
      mkDerivation {
        pname = "foldl";
-       version = "1.3.0";
-       sha256 = "1rinr1a18pjwlrk21d9sfg0f954cwdc3bk9jl276ypcf8ydy3yin";
+       version = "1.3.1";
+       sha256 = "0g9f2lzlv59bzdjkm917fpcfxrmkzhrmh3jgd2xnfwcb7sfrbmma";
        libraryHaskellDepends = [
          base bytestring comonad containers contravariant hashable
          mwc-random primitive profunctors text transformers
@@ -71277,8 +71229,8 @@ self: {
      }:
      mkDerivation {
        pname = "forest";
-       version = "0.1.1.1";
-       sha256 = "0g14zghqhajjbnkds26l09xfq8g7l2nykha3nsbg7f34v8d34yqp";
+       version = "0.2";
+       sha256 = "0z8wfvylzcls994yg3s4bywjxl3592y4ba6gcn2h8ndc7c8w09v4";
        libraryHaskellDepends = [
          aeson base bifunctors deepseq hashable profunctors semigroupoids
        ];
@@ -75671,23 +75623,6 @@ self: {
      }) {};
 
   "ghc-heap-view" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, deepseq, ghc
-     , template-haskell, transformers
-     }:
-     mkDerivation {
-       pname = "ghc-heap-view";
-       version = "0.5.9";
-       sha256 = "1brjvyqd4bzzc1vhljbf5qv9lyf55myyvnz1zx9nngfwsh7a6cf6";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base binary bytestring containers ghc template-haskell transformers
-       ];
-       testHaskellDepends = [ base deepseq ];
-       description = "Extract the heap representation of Haskell values and thunks";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ghc-heap-view_0_5_10" = callPackage
     ({ mkDerivation, base, binary, bytestring, Cabal, containers
      , deepseq, filepath, ghc, template-haskell, transformers
      }:
@@ -75703,7 +75638,6 @@ self: {
        testHaskellDepends = [ base deepseq ];
        description = "Extract the heap representation of Haskell values and thunks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-imported-from" = callPackage
@@ -76002,8 +75936,8 @@ self: {
     ({ mkDerivation, base, ghc, transformers }:
      mkDerivation {
        pname = "ghc-proofs";
-       version = "0.1";
-       sha256 = "18zznyh84sv5qvxqzk1lkkx3lrqprkqnx996cjywyix5z5kdk5gk";
+       version = "0.1.1";
+       sha256 = "1kyy2wck8n6cjfcsqv4ki5dsakgps9brpad0lcsgnpixx9x8w88h";
        libraryHaskellDepends = [ base ghc ];
        testHaskellDepends = [ base transformers ];
        homepage = "https://github.com/nomeata/ghc-proofs";
@@ -76790,6 +76724,27 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) gdk_pixbuf;};
 
+  "gi-gdkx11" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, gdk-x11
+     , gi-gdk, gi-gio, gi-gobject, gi-xlib, haskell-gi, haskell-gi-base
+     , haskell-gi-overloading, text, transformers
+     }:
+     mkDerivation {
+       pname = "gi-gdkx11";
+       version = "3.0.1";
+       sha256 = "0y9dkiwrx6d7r94ihczc250c2wzg2l4jsz9i198r4kysjdgm7q7v";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers gi-gdk gi-gio gi-gobject gi-xlib
+         haskell-gi haskell-gi-base haskell-gi-overloading text transformers
+       ];
+       libraryPkgconfigDepends = [ gdk-x11 ];
+       doHaddock = false;
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "GdkX11 bindings";
+       license = stdenv.lib.licenses.lgpl21;
+     }) {gdk-x11 = null;};
+
   "gi-ggit" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
      , gi-glib, gi-gobject, haskell-gi, haskell-gi-base
@@ -77414,6 +77369,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {webkitgtk-web-extension = null;};
 
+  "gi-xlib" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi
+     , haskell-gi-base, haskell-gi-overloading, text, transformers, x11
+     }:
+     mkDerivation {
+       pname = "gi-xlib";
+       version = "2.0.1";
+       sha256 = "1f1f3jnrvqisdalsad9k9wjr92c4ykw2i1gngsygainflk3hzgia";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers haskell-gi haskell-gi-base
+         haskell-gi-overloading text transformers
+       ];
+       libraryPkgconfigDepends = [ x11 ];
+       doHaddock = false;
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "xlib bindings";
+       license = stdenv.lib.licenses.lgpl21;
+     }) {inherit (pkgs) x11;};
+
   "giak" = callPackage
     ({ mkDerivation, async, base, bytestring, Cabal, containers
      , directory, extra, filemanip, filepath, mtl, process, semigroups
@@ -78172,27 +78147,6 @@ self: {
      }:
      mkDerivation {
        pname = "github-release";
-       version = "1.0.5";
-       sha256 = "1dmilm5mwgb975f6n34x3ylnkipqrvxcimkvj6pyfw97bdcclacb";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring http-client http-client-tls http-types
-         mime-types optparse-generic text unordered-containers uri-templater
-       ];
-       executableHaskellDepends = [ base ];
-       homepage = "https://github.com/tfausak/github-release#readme";
-       description = "Upload files to GitHub releases";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "github-release_1_0_6" = 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.6";
        sha256 = "1ixs76y5cb1dkrvl8i13a7s9xgs3170w3sjx6bhj05fi6wvz3n8z";
        isLibrary = true;
@@ -78205,7 +78159,6 @@ self: {
        homepage = "https://github.com/tfausak/github-release#readme";
        description = "Upload files to GitHub releases";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "github-tools" = callPackage
@@ -83097,22 +83050,6 @@ self: {
      }:
      mkDerivation {
        pname = "grouped-list";
-       version = "0.2.1.2";
-       sha256 = "0xg8z3ipa9h6zjji3s1dwal3fkdii7bp36cikj0rlxfrn4s9zi2v";
-       libraryHaskellDepends = [ base containers deepseq pointed ];
-       testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
-       benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/Daniel-Diaz/grouped-list/blob/master/README.md";
-       description = "Grouped lists. Equal consecutive elements are grouped.";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "grouped-list_0_2_1_3" = callPackage
-    ({ mkDerivation, base, containers, criterion, deepseq, pointed
-     , QuickCheck, tasty, tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "grouped-list";
        version = "0.2.1.3";
        sha256 = "1ggmjn9gmq3ksbavvi0cqb96fnkbmhr9bsadkilpdnnndfdz0rdy";
        libraryHaskellDepends = [ base containers deepseq pointed ];
@@ -83121,7 +83058,6 @@ self: {
        homepage = "https://github.com/Daniel-Diaz/grouped-list/blob/master/README.md";
        description = "Grouped lists. Equal consecutive elements are grouped.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "groupoid" = callPackage
@@ -87050,6 +86986,33 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hapistrano_0_3_3_0" = callPackage
+    ({ mkDerivation, aeson, async, base, directory, filepath, hspec
+     , mtl, optparse-applicative, path, path-io, process, stm, temporary
+     , time, transformers, yaml
+     }:
+     mkDerivation {
+       pname = "hapistrano";
+       version = "0.3.3.0";
+       sha256 = "1skpygsnzl940703fxd103lxhyi4cjpp5il9kwjqfavsnbfi0c46";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base filepath mtl path process time transformers
+       ];
+       executableHaskellDepends = [
+         aeson async base optparse-applicative path path-io stm yaml
+       ];
+       testHaskellDepends = [
+         base directory filepath hspec mtl path path-io process temporary
+       ];
+       homepage = "https://github.com/stackbuilders/hapistrano";
+       description = "A deployment library for Haskell applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "happindicator" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, glib, gtk
      , gtk2hs-buildtools, libappindicator-gtk2, mtl
@@ -87762,28 +87725,8 @@ self: {
      }:
      mkDerivation {
        pname = "happy";
-       version = "1.19.5";
-       sha256 = "1nj353q4z1g186fpjzf0dnsg71qhxqpamx8jy89rjjvv3p0kmw32";
-       revision = "2";
-       editedCabalFile = "1dvhv94lzmya938i5crshg9qbx7dxvkyxkhfbqimxkydxn7l2w7w";
-       isLibrary = false;
-       isExecutable = true;
-       setupHaskellDepends = [ base Cabal directory filepath ];
-       executableHaskellDepends = [ array base containers mtl ];
-       testHaskellDepends = [ base process ];
-       homepage = "http://www.haskell.org/happy/";
-       description = "Happy is a parser generator for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "happy_1_19_6" = callPackage
-    ({ mkDerivation, array, base, Cabal, containers, directory
-     , filepath, mtl, process
-     }:
-     mkDerivation {
-       pname = "happy";
-       version = "1.19.6";
-       sha256 = "1hqg42cmaa5zc499sank10r8qyqkgwlv5sr17b748kz5j3n2nivw";
+       version = "1.19.7";
+       sha256 = "16vg292pp12wnkny7znsv7bichh9ghny7swl7v55qafmcfg2lcdv";
        isLibrary = false;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal directory filepath ];
@@ -87792,7 +87735,6 @@ self: {
        homepage = "https://www.haskell.org/happy/";
        description = "Happy is a parser generator for Haskell";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happy-meta" = callPackage
@@ -88046,6 +87988,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "harp_0_4_3" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "harp";
+       version = "0.4.3";
+       sha256 = "17d9isgwdvrmycbj3ddmmn0810kh4m8b8lmaz4qc8i51i5li8ja7";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/seereason/harp";
+       description = "HaRP allows pattern-matching with regular expressions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "harpy" = callPackage
     ({ mkDerivation, array, base, containers, disassembler, mtl, parsec
      , pretty, template-haskell
@@ -101291,28 +101246,6 @@ self: {
      }:
      mkDerivation {
        pname = "hsass";
-       version = "0.4.1";
-       sha256 = "1k7v2m4k90dg5hbkswf2ff5nm6ri58nlmc1jq9lwv6dxiqbm3nv7";
-       libraryHaskellDepends = [
-         base bytestring data-default-class filepath hlibsass monad-loops
-         transformers
-       ];
-       testHaskellDepends = [
-         base bytestring data-default-class hspec hspec-discover temporary
-       ];
-       homepage = "https://github.com/jakubfijalkowski/hsass";
-       description = "Integrating Sass into Haskell applications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hsass_0_4_2" = callPackage
-    ({ mkDerivation, base, bytestring, data-default-class, filepath
-     , hlibsass, hspec, hspec-discover, monad-loops, temporary
-     , transformers
-     }:
-     mkDerivation {
-       pname = "hsass";
        version = "0.4.2";
        sha256 = "0hv2falrm3dcmdx08mpk2z8yxfr1hahgrd3ff9yvw6xjcjzab5yh";
        libraryHaskellDepends = [
@@ -102265,6 +102198,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hsexif_0_6_1_3" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, hspec, HUnit
+     , iconv, text, time
+     }:
+     mkDerivation {
+       pname = "hsexif";
+       version = "0.6.1.3";
+       sha256 = "09d8679m6xgbka36rwjvhr7w355dn6arp7cxkdjgbzm7x9zhi5w8";
+       libraryHaskellDepends = [
+         base binary bytestring containers iconv text time
+       ];
+       testHaskellDepends = [
+         base binary bytestring containers hspec HUnit iconv text time
+       ];
+       homepage = "https://github.com/emmanueltouzery/hsexif";
+       description = "EXIF handling library in pure Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hsfacter" = callPackage
     ({ mkDerivation, base, containers, language-puppet, text }:
      mkDerivation {
@@ -102447,8 +102400,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsini";
-       version = "0.5.0";
-       sha256 = "16dlxfjmn1m9sqf15png7bq9fpw5p0acb9kbp2fi7himdmdhghni";
+       version = "0.5.1";
+       sha256 = "0kh96xnpsz1ryrn1f8sajxzjlvqwg8dbhpz6409qdxl57vppcjfq";
        libraryHaskellDepends = [ base bytestring containers mtl parsec ];
        testHaskellDepends = [
          base bytestring containers HUnit mtl parsec QuickCheck tasty
@@ -109734,6 +109687,8 @@ self: {
        pname = "imm";
        version = "1.2.0.0";
        sha256 = "1bpcsahzvf4qa1pzga84wqflk259wcqd41r3rfxk2w3rzdlns999";
+       revision = "1";
+       editedCabalFile = "1yk1vih0fr53wrq5ksjwi21ba51r6qxhvyzz30iycdbv3zm53pmw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -111898,6 +111853,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "io-streams_1_5_0_1" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder
+     , deepseq, directory, filepath, HUnit, mtl, network, primitive
+     , process, QuickCheck, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, time, transformers, vector
+     , zlib, zlib-bindings
+     }:
+     mkDerivation {
+       pname = "io-streams";
+       version = "1.5.0.1";
+       sha256 = "12rcdg2d70644bvn838fxcjkssqj8pssnx5y657si5rijcbkgjsx";
+       configureFlags = [ "-fnointeractivetests" ];
+       libraryHaskellDepends = [
+         attoparsec base bytestring bytestring-builder network primitive
+         process text time transformers vector zlib-bindings
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring bytestring-builder deepseq directory
+         filepath HUnit mtl network primitive process QuickCheck
+         test-framework test-framework-hunit test-framework-quickcheck2 text
+         time transformers vector zlib zlib-bindings
+       ];
+       description = "Simple, composable, and easy-to-use stream I/O";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "io-streams-haproxy" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, HUnit, io-streams
      , network, test-framework, test-framework-hunit, transformers
@@ -111920,6 +111902,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "io-streams-haproxy_1_0_0_2" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, HUnit, io-streams
+     , network, test-framework, test-framework-hunit, transformers
+     }:
+     mkDerivation {
+       pname = "io-streams-haproxy";
+       version = "1.0.0.2";
+       sha256 = "11nh9q158mgnvvb23s5ffg87lkhl5smk039yl43jghxmb214z0bp";
+       libraryHaskellDepends = [
+         attoparsec base bytestring io-streams network transformers
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring HUnit io-streams network test-framework
+         test-framework-hunit transformers
+       ];
+       homepage = "http://snapframework.com/";
+       description = "HAProxy protocol 1.5 support for io-streams";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "io-streams-http" = callPackage
     ({ mkDerivation, base, bytestring, http-client, http-client-tls
      , io-streams, mtl, transformers
@@ -112392,8 +112395,8 @@ self: {
        pname = "irc-dcc";
        version = "2.0.1";
        sha256 = "1pyj4ngh6rw0k1cd9nlrhwb6rr3jmpiwaxs6crik8gbl6f3s4234";
-       revision = "3";
-       editedCabalFile = "1kc4yzm5k0s069dhyncj5rmxnbfjjn8ynx182wp9v5qhylgicx98";
+       revision = "4";
+       editedCabalFile = "05g3c22qz9slc2q107blvg2bym2igk22w0gs60xw7ly78fh1s6s3";
        libraryHaskellDepends = [
          attoparsec base binary bytestring io-streams iproute irc-ctcp mtl
          network path safe-exceptions transformers utf8-string
@@ -113817,6 +113820,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "jbi" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, Cabal, directory
+     , filepath, optparse-applicative, process, tagged, text
+     }:
+     mkDerivation {
+       pname = "jbi";
+       version = "0.1.0.0";
+       sha256 = "13jswxfka5v8n2sdxg0p75ykhgvb351cih2zlid8x05lpiqlw87c";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base Cabal directory filepath process tagged
+       ];
+       executableHaskellDepends = [
+         aeson-pretty base optparse-applicative text
+       ];
+       description = "Just Build It - a \"do what I mean\" abstraction for Haskell build tools";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "jcdecaux-vls" = callPackage
     ({ mkDerivation, aeson, base, bytestring, http-conduit, text
      , transformers
@@ -114186,29 +114209,6 @@ self: {
      }:
      mkDerivation {
        pname = "jose-jwt";
-       version = "0.7.6";
-       sha256 = "0kf9v9l1v7ixwpjaq1vc7lrg2669zddvsq8394yhxsgdyyrsi82a";
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring cereal containers cryptonite
-         either memory mtl text time unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring cryptonite doctest either hspec HUnit memory
-         mtl QuickCheck text unordered-containers vector
-       ];
-       benchmarkHaskellDepends = [ base bytestring criterion cryptonite ];
-       homepage = "http://github.com/tekul/jose-jwt";
-       description = "JSON Object Signing and Encryption Library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "jose-jwt_0_7_7" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal
-     , containers, criterion, cryptonite, doctest, either, hspec, HUnit
-     , memory, mtl, QuickCheck, text, time, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "jose-jwt";
        version = "0.7.7";
        sha256 = "07mq4w4gvak8gahxdx3rwykwqqisxma8faxi4k0xfk6jcpai0snl";
        libraryHaskellDepends = [
@@ -114223,7 +114223,6 @@ self: {
        homepage = "http://github.com/tekul/jose-jwt";
        description = "JSON Object Signing and Encryption Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jpeg" = callPackage
@@ -115036,8 +115035,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-stream";
-       version = "0.4.1.3";
-       sha256 = "1p7r3wj2ap748igbrp4y6hg6pwf1s3dpb2jbi87b8w8wvpyiqa0y";
+       version = "0.4.1.4";
+       sha256 = "0mg1pv1gp2zd7zpl2n5k8kv73br8ji91mwszfhn1bw119m29v1rs";
        libraryHaskellDepends = [
          aeson base bytestring scientific text unordered-containers vector
        ];
@@ -115050,15 +115049,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "json-stream_0_4_1_4" = callPackage
+  "json-stream_0_4_1_5" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, doctest, hspec
      , QuickCheck, quickcheck-unicode, scientific, text
      , unordered-containers, vector
      }:
      mkDerivation {
        pname = "json-stream";
-       version = "0.4.1.4";
-       sha256 = "0mg1pv1gp2zd7zpl2n5k8kv73br8ji91mwszfhn1bw119m29v1rs";
+       version = "0.4.1.5";
+       sha256 = "0h5g76grhi60idvmxdhydpz5f3198bydwywfyv9pghlmbrzjnkih";
        libraryHaskellDepends = [
          aeson base bytestring scientific text unordered-containers vector
        ];
@@ -115463,8 +115462,8 @@ self: {
      }:
      mkDerivation {
        pname = "jukebox";
-       version = "0.2.20";
-       sha256 = "178fnfn0bjgk9rp5sv00l5vs3cmp3rcxzmm163y68w2azm4125an";
+       version = "0.3";
+       sha256 = "0fpzbijv73drgk79rf8qyr2w4kfvxbpysbi9y9v2qx5na9y3krci";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -117511,25 +117510,12 @@ self: {
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "labels";
-       version = "0.3.2";
-       sha256 = "0c8agrqs4pphs3m2f2jq9mfg9q55lihzgb119z1zifddwsghq1n4";
-       libraryHaskellDepends = [ base template-haskell ];
-       homepage = "https://github.com/chrisdone/labels#readme";
-       description = "Anonymous records via named tuples";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "labels_0_3_3" = callPackage
-    ({ mkDerivation, base, template-haskell }:
-     mkDerivation {
-       pname = "labels";
        version = "0.3.3";
        sha256 = "04rh8c9ncd9radarz4fjka9hc3i6crvibpyj3y8qpij0acmw1d76";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/chrisdone/labels#readme";
        description = "Anonymous records via named tuples";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "laborantin-hs" = callPackage
@@ -121329,8 +121315,8 @@ self: {
      }:
      mkDerivation {
        pname = "libgraph";
-       version = "1.13";
-       sha256 = "0h4sas34nfql5w3mxds1j68qv4mcfjrrawxssd3rr23d1icavw2c";
+       version = "1.14";
+       sha256 = "0grzimgy946mnwggmlc3sja567v2s21ymcwzlwf110k11pjqp5xp";
        libraryHaskellDepends = [
          array base containers monads-tf process union-find
        ];
@@ -124686,6 +124672,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "logging-effect_1_2_1" = callPackage
+    ({ mkDerivation, async, base, bytestring, criterion, exceptions
+     , fast-logger, free, lifted-async, monad-control, monad-logger, mtl
+     , semigroups, stm, stm-delay, text, time, transformers
+     , transformers-base, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "logging-effect";
+       version = "1.2.1";
+       sha256 = "1jjw2ach3mni7pnfcw29z2fw5vffhq8i8qh8sn4n4jcya2mfp7xd";
+       libraryHaskellDepends = [
+         async base exceptions free monad-control mtl semigroups stm
+         stm-delay text time transformers transformers-base wl-pprint-text
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion fast-logger lifted-async monad-logger
+         text time wl-pprint-text
+       ];
+       homepage = "https://github.com/ocharles/logging-effect";
+       description = "A mtl-style monad transformer for general purpose & compositional logging";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "logging-facade" = callPackage
     ({ mkDerivation, base, call-stack, hspec, transformers }:
      mkDerivation {
@@ -127604,6 +127614,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "markup_4_0_1" = callPackage
+    ({ mkDerivation, base, blaze-html, blaze-markup, clay, comonad
+     , lucid, mmorph, monad-control, monad-logger, mtl, path-extra
+     , resourcet, text, transformers-base, urlpath
+     }:
+     mkDerivation {
+       pname = "markup";
+       version = "4.0.1";
+       sha256 = "1g2vdwwk0if46q0gc1gw4zpbxjbq6lpii0yab6yazdk4a2snakmx";
+       libraryHaskellDepends = [
+         base blaze-html blaze-markup clay comonad lucid mmorph
+         monad-control monad-logger mtl path-extra resourcet text
+         transformers-base urlpath
+       ];
+       description = "Abstraction for HTML-embedded content";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "markup-preview" = callPackage
     ({ mkDerivation, base, cmdargs, directory, glib, gtk
      , gtk2hs-buildtools, MissingH, mtl, pandoc, temporary, text
@@ -129035,8 +129064,8 @@ self: {
      }:
      mkDerivation {
        pname = "mellon-core";
-       version = "0.7.1.1";
-       sha256 = "1s3a5wkfi9pjxgsg92cx5sgf8kwlvc423414k679b2il97ff1cwf";
+       version = "0.8.0.2";
+       sha256 = "0fl9pwh67diibj2ki75xcwylbhvw0nqn0b0azla4ndr3fxdgnh30";
        libraryHaskellDepends = [ async base mtl time transformers ];
        testHaskellDepends = [
          async base doctest hlint hspec mtl QuickCheck quickcheck-instances
@@ -129052,8 +129081,8 @@ self: {
     ({ mkDerivation, base, hlint, hpio, mellon-core }:
      mkDerivation {
        pname = "mellon-gpio";
-       version = "0.7.1.1";
-       sha256 = "0mq5p462rm8h2nwkdqhwfndi3qqjcqb30hwlpa8ms3d4bjn8xdan";
+       version = "0.8.0.2";
+       sha256 = "1dx31nyyi4gar2wlmmgfnqi48x4pzwh53q87xg8rrbghc9vfqygj";
        libraryHaskellDepends = [ base hpio mellon-core ];
        testHaskellDepends = [ base hlint ];
        homepage = "https://github.com/quixoftic/mellon/";
@@ -129074,8 +129103,8 @@ self: {
      }:
      mkDerivation {
        pname = "mellon-web";
-       version = "0.7.1.1";
-       sha256 = "0x9pj12lfk2yk18rp81s6dvh70rybrzcwclnwxwsqvfza3p3kpzc";
+       version = "0.8.0.2";
+       sha256 = "03awn8qcqn5iz5cd082cr6ap15zlbidp5l2aacz24m0fn5vdgjlf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -129386,6 +129415,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "memory_0_14_7" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, foundation, ghc-prim
+     , tasty, tasty-hunit, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "memory";
+       version = "0.14.7";
+       sha256 = "0snm3kphsrjixg1hpas1rfxaq7id7i5siprqf1p9lz7x1l4vznyj";
+       libraryHaskellDepends = [
+         base bytestring deepseq foundation ghc-prim
+       ];
+       testHaskellDepends = [
+         base foundation tasty tasty-hunit tasty-quickcheck
+       ];
+       homepage = "https://github.com/vincenthz/hs-memory";
+       description = "memory and related abstraction stuff";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "memorypool" = callPackage
     ({ mkDerivation, base, containers, transformers, unsafe, vector }:
      mkDerivation {
@@ -132397,6 +132446,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "monad-recorder" = callPackage
+    ({ mkDerivation, base, exceptions, hspec, monad-control, mtl
+     , transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "monad-recorder";
+       version = "0.1.0";
+       sha256 = "1n3bp3vian88b6wq2r3qybbnvnflphf1815g1qd6kb9r7d4z2g9i";
+       libraryHaskellDepends = [
+         base exceptions monad-control mtl transformers transformers-base
+       ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "http://github.com/harendra-kumar/monad-recorder";
+       description = "Record and replay the results of monadic actions";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "monad-resumption" = callPackage
     ({ mkDerivation, base, mmorph, mtl, transformers }:
      mkDerivation {
@@ -133601,26 +133667,25 @@ self: {
      }) {};
 
   "movie-monad" = callPackage
-    ({ mkDerivation, base, gi-gdkx11, gi-glib, gi-gobject, gi-gst
-     , gi-gstvideo, gi-gtk, gi-xlib, haskell-gi-base, MissingH, process
-     , text
+    ({ mkDerivation, base, gi-gdk, gi-gdkx11, gi-glib, gi-gobject
+     , gi-gst, gi-gstvideo, gi-gtk, gi-xlib, haskell-gi-base, MissingH
+     , process, text
      }:
      mkDerivation {
        pname = "movie-monad";
-       version = "0.0.0.0";
-       sha256 = "1qwj25db28sjci12grs3n6div58j0wj3f5rck90lmy7da9vca7f3";
+       version = "0.0.1.0";
+       sha256 = "02sj8x49lw80nhzlwsnddj7r9w6xfv1vks4rpgds89pmkr4b5bvn";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [
-         base gi-gdkx11 gi-glib gi-gobject gi-gst gi-gstvideo gi-gtk gi-xlib
-         haskell-gi-base MissingH process text
+         base gi-gdk gi-gdkx11 gi-glib gi-gobject gi-gst gi-gstvideo gi-gtk
+         gi-xlib haskell-gi-base MissingH process text
        ];
        homepage = "https://github.com/lettier/movie-monad";
        description = "Plays videos using GStreamer and GTK+";
        license = stdenv.lib.licenses.bsd3;
-       broken = true;
-     }) {gi-gdkx11 = null; gi-xlib = null;};
+     }) {};
 
   "moving-averages" = callPackage
     ({ mkDerivation, base, hspec }:
@@ -135745,25 +135810,6 @@ self: {
      }:
      mkDerivation {
        pname = "mysql-simple";
-       version = "0.4.0.1";
-       sha256 = "0bdz9hy6921s3g6ddgs5km3yjmw3sz6xd0kb06mwd22wall9sm8v";
-       libraryHaskellDepends = [
-         attoparsec base base16-bytestring blaze-builder blaze-textual
-         bytestring mysql old-locale pcre-light text time
-       ];
-       testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/paul-rouse/mysql-simple";
-       description = "A mid-level MySQL client library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "mysql-simple_0_4_1_0" = callPackage
-    ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder
-     , blaze-textual, bytestring, hspec, mysql, old-locale, pcre-light
-     , text, time
-     }:
-     mkDerivation {
-       pname = "mysql-simple";
        version = "0.4.1.0";
        sha256 = "008ygaawqm91323ypsq2ih9bsvm10kld6p80av2p61iaklancgva";
        libraryHaskellDepends = [
@@ -135774,7 +135820,6 @@ self: {
        homepage = "https://github.com/paul-rouse/mysql-simple";
        description = "A mid-level MySQL client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mysql-simple-quasi" = callPackage
@@ -141807,6 +141852,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "openssl-streams_1_2_1_2" = callPackage
+    ({ mkDerivation, base, bytestring, HsOpenSSL, HUnit, io-streams
+     , network, test-framework, test-framework-hunit
+     }:
+     mkDerivation {
+       pname = "openssl-streams";
+       version = "1.2.1.2";
+       sha256 = "0szfh7jjp8z8yz043a5vil8i1nhrwshaklx2m62n0jz8p6ff3h1b";
+       libraryHaskellDepends = [
+         base bytestring HsOpenSSL io-streams network
+       ];
+       testHaskellDepends = [
+         base bytestring HsOpenSSL HUnit io-streams network test-framework
+         test-framework-hunit
+       ];
+       description = "OpenSSL network support for io-streams";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "opentheory" = callPackage
     ({ mkDerivation, base, opentheory-primitive, QuickCheck }:
      mkDerivation {
@@ -145574,6 +145639,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "path-extra_0_0_5" = callPackage
+    ({ mkDerivation, base, exceptions, path }:
+     mkDerivation {
+       pname = "path-extra";
+       version = "0.0.5";
+       sha256 = "0ks2h5w4zmgimhcxj6vxv3xrrkpjlfc21pdd8w4gbxci1gsd2jyh";
+       libraryHaskellDepends = [ base exceptions path ];
+       description = "Chris Done's path library, enriched with URL-related goodies";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "path-io" = callPackage
     ({ mkDerivation, base, containers, directory, exceptions, filepath
      , hspec, path, temporary, time, transformers, unix-compat
@@ -148305,6 +148382,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ping-parser-attoparsec" = callPackage
+    ({ mkDerivation, attoparsec, base, hspec, iproute, placeholders
+     , QuickCheck, quickcheck-text, text
+     }:
+     mkDerivation {
+       pname = "ping-parser-attoparsec";
+       version = "0.1.0.0";
+       sha256 = "1xlqq8hki5jd6ii1j7bbnh0zigqsjm4wl9hpl46bjvlj0qzwmdww";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base iproute placeholders text
+       ];
+       executableHaskellDepends = [ base placeholders ];
+       testHaskellDepends = [
+         attoparsec base hspec iproute QuickCheck quickcheck-text
+       ];
+       homepage = "https://github.com/frincon/ping-parser-attoparsec";
+       description = "Attoparsec parsers of ping utility";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "pipe-enumerator" = callPackage
     ({ mkDerivation, base, enumerator, pipes, transformers }:
      mkDerivation {
@@ -148654,6 +148753,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes-concurrency_2_0_8" = callPackage
+    ({ mkDerivation, async, base, contravariant, pipes, stm, void }:
+     mkDerivation {
+       pname = "pipes-concurrency";
+       version = "2.0.8";
+       sha256 = "0ak6vnjl12q4615waifbpdxbm96yz5yzqzwjj1zwvvb2jfk5snwz";
+       libraryHaskellDepends = [
+         async base contravariant pipes stm void
+       ];
+       testHaskellDepends = [ async base pipes stm ];
+       description = "Concurrency for the pipes ecosystem";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pipes-conduit" = callPackage
     ({ mkDerivation, base, conduit, mtl, pipes-core }:
      mkDerivation {
@@ -148859,6 +148973,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes-group_1_0_8" = callPackage
+    ({ mkDerivation, base, doctest, free, lens-family-core, pipes
+     , pipes-parse, transformers
+     }:
+     mkDerivation {
+       pname = "pipes-group";
+       version = "1.0.8";
+       sha256 = "0zcmhq46972zxjj5nmr46fdvvwb3q0i42q9m70i758a3iwkmnr3a";
+       libraryHaskellDepends = [
+         base free pipes pipes-parse transformers
+       ];
+       testHaskellDepends = [ base doctest lens-family-core ];
+       description = "Group streams into substreams";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pipes-http" = callPackage
     ({ mkDerivation, base, bytestring, http-client, http-client-tls
      , pipes
@@ -149813,6 +149944,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "plot_0_2_3_8" = callPackage
+    ({ mkDerivation, array, base, cairo, colour, hmatrix, mtl, pango
+     , transformers
+     }:
+     mkDerivation {
+       pname = "plot";
+       version = "0.2.3.8";
+       sha256 = "1in77bvn77wyg9b8vixxd2m5vfnz90in89j3f31v9zbz7fxh2l4m";
+       libraryHaskellDepends = [
+         array base cairo colour hmatrix mtl pango transformers
+       ];
+       homepage = "http://github.com/amcphail/plot";
+       description = "A plotting library, exportable as eps/pdf/svg/png or renderable with gtk";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "plot-gtk" = callPackage
     ({ mkDerivation, base, glib, gtk, hmatrix, mtl, plot, process }:
      mkDerivation {
@@ -151820,8 +151968,8 @@ self: {
      }:
      mkDerivation {
        pname = "postmark";
-       version = "0.2.0";
-       sha256 = "14p4zff7phmavw4q0ygyd0b3sllgyn28q994zbgwmpvk9l1a6d80";
+       version = "0.2.1";
+       sha256 = "1afy3yra89909vilwr36j8vrvkhsy1xcp1jcvrdj90bj93rq64v3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -153588,6 +153736,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "product-isomorphic" = callPackage
+    ({ mkDerivation, base, template-haskell, th-data-compat }:
+     mkDerivation {
+       pname = "product-isomorphic";
+       version = "0.0.2.0";
+       sha256 = "01fyzyvcz7gvcjmglzb562dmbdrkm34qg5ba16f2xiw8fmj992yh";
+       libraryHaskellDepends = [ base template-haskell th-data-compat ];
+       homepage = "http://github.com/khibino/haskell-product-isomorphic";
+       description = "Weaken applicative functor on products";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "product-profunctors" = callPackage
     ({ mkDerivation, base, contravariant, profunctors, tagged
      , template-haskell
@@ -161213,8 +161373,8 @@ self: {
      }:
      mkDerivation {
        pname = "regexchar";
-       version = "0.9.0.14";
-       sha256 = "0hjj4p44zhl4iazw8ivaxldvrghbdfqabkf8d6shb4mw4r0xdqbx";
+       version = "0.9.0.15";
+       sha256 = "05p3m9phi84lj94vw2l1jdzcxpq96rch64q85jc0wvcb22y6rfm7";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -161636,29 +161796,6 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query";
-       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
-         time-locale-compat transformers
-       ];
-       testHaskellDepends = [
-         base containers quickcheck-simple transformers
-       ];
-       homepage = "http://khibino.github.io/haskell-relational-record/";
-       description = "Typeful, Modular, Relational, algebraic query engine";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "relational-query_0_9_5_0" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, dlist
-     , names-th, persistable-record, quickcheck-simple, sql-words
-     , template-haskell, text, th-reify-compat, time, time-locale-compat
-     , transformers
-     }:
-     mkDerivation {
-       pname = "relational-query";
        version = "0.9.5.0";
        sha256 = "17skrxqh3cpjkjjvbnhdlagfymdp0i3y2c5d92pg0krhc2dfida0";
        libraryHaskellDepends = [
@@ -161672,7 +161809,6 @@ self: {
        homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "Typeful, Modular, Relational, algebraic query engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "relational-query-HDBC" = callPackage
@@ -161683,26 +161819,6 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query-HDBC";
-       version = "0.6.4.0";
-       sha256 = "1mybp5nq0l4c9b4as16878c02z282ml3gxisnkrwb80y1xrgdfd2";
-       libraryHaskellDepends = [
-         base containers convertible dlist HDBC HDBC-session names-th
-         persistable-record relational-query relational-schemas
-         template-haskell th-data-compat transformers
-       ];
-       homepage = "http://khibino.github.io/haskell-relational-record/";
-       description = "HDBC instance of relational-query and typed query interface for HDBC";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "relational-query-HDBC_0_6_4_1" = callPackage
-    ({ mkDerivation, base, containers, convertible, dlist, HDBC
-     , HDBC-session, names-th, persistable-record, relational-query
-     , relational-schemas, template-haskell, th-data-compat
-     , transformers
-     }:
-     mkDerivation {
-       pname = "relational-query-HDBC";
        version = "0.6.4.1";
        sha256 = "0bnksx9sq99hknj67wgg25yjbnkfdlaswhr2n6ndrrjpvkrx2lsi";
        libraryHaskellDepends = [
@@ -161713,7 +161829,6 @@ self: {
        homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "HDBC instance of relational-query and typed query interface for HDBC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "relational-record" = callPackage
@@ -161763,22 +161878,6 @@ self: {
      }:
      mkDerivation {
        pname = "relational-schemas";
-       version = "0.1.4.0";
-       sha256 = "1z0v175gx6yxmfjl55dyhsmpmyvrgwzynjy9yhi348kvij7iyivq";
-       libraryHaskellDepends = [
-         base bytestring containers relational-query template-haskell time
-       ];
-       homepage = "http://khibino.github.io/haskell-relational-record/";
-       description = "RDBMSs' schema templates for relational-query";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "relational-schemas_0_1_4_1" = callPackage
-    ({ mkDerivation, base, bytestring, containers, relational-query
-     , template-haskell, time
-     }:
-     mkDerivation {
-       pname = "relational-schemas";
        version = "0.1.4.1";
        sha256 = "1szxxh3m11rfndw7rsbsks4iagk61r5w0l6s4k2zh7xhzcfrhs83";
        libraryHaskellDepends = [
@@ -161787,7 +161886,6 @@ self: {
        homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "RDBMSs' schema templates for relational-query";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "relative-date" = callPackage
@@ -165060,27 +165158,31 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
-  "rss-conduit_0_3_2_0" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, conduit-combinators
-     , containers, data-default, hlint, lens-simple, mono-traversable
+  "rss-conduit_0_4_0_0" = callPackage
+    ({ mkDerivation, atom-conduit, base, bytestring, conduit
+     , conduit-combinators, containers, data-default
+     , dublincore-xml-conduit, hlint, lens-simple, mono-traversable
      , QuickCheck, quickcheck-instances, resourcet, safe
-     , safe-exceptions, tasty, tasty-hunit, tasty-quickcheck, text, time
-     , timerep, uri-bytestring, xml-conduit, xml-types
+     , safe-exceptions, singletons, tasty, tasty-hunit, tasty-quickcheck
+     , text, time, timerep, uri-bytestring, vinyl, xml-conduit
+     , xml-types
      }:
      mkDerivation {
        pname = "rss-conduit";
-       version = "0.3.2.0";
-       sha256 = "0ps0ynn0d0nz4m556i5w39bwx4m6wfsv3c9a269rkq821z844f3n";
+       version = "0.4.0.0";
+       sha256 = "0120r3hb6321cb8n8q3l9fybmjndar8plplgx2qxnxwsbq4r7h10";
        libraryHaskellDepends = [
-         base conduit conduit-combinators containers lens-simple
-         mono-traversable safe safe-exceptions text time timerep
-         uri-bytestring xml-conduit xml-types
+         atom-conduit base conduit conduit-combinators containers
+         dublincore-xml-conduit lens-simple mono-traversable safe
+         safe-exceptions singletons text time timerep uri-bytestring vinyl
+         xml-conduit xml-types
        ];
        testHaskellDepends = [
-         base bytestring conduit conduit-combinators data-default hlint
-         lens-simple mono-traversable QuickCheck quickcheck-instances
-         resourcet safe-exceptions tasty tasty-hunit tasty-quickcheck text
-         time uri-bytestring xml-conduit xml-types
+         atom-conduit base bytestring conduit conduit-combinators
+         data-default dublincore-xml-conduit hlint lens-simple
+         mono-traversable QuickCheck quickcheck-instances resourcet
+         safe-exceptions singletons tasty tasty-hunit tasty-quickcheck text
+         time uri-bytestring vinyl xml-conduit xml-types
        ];
        description = "Streaming parser/renderer for the RSS standard";
        license = stdenv.lib.licenses.publicDomain;
@@ -165568,8 +165670,8 @@ self: {
     ({ mkDerivation, base, mtl, transformers }:
      mkDerivation {
        pname = "safe-access";
-       version = "0.3.2.0";
-       sha256 = "0v0bmxi3y9h7nriyna35crqxngda1cfliiqbrs6iy0frc2s5lv1l";
+       version = "0.3.2.1";
+       sha256 = "1xfivmd1ski2lbjkp5mxd5qjscjjw1bzxwd5s9hwvqlqsgdhya9b";
        libraryHaskellDepends = [ base mtl transformers ];
        homepage = "http://darcs.redspline.com/safe-access";
        description = "A simple environment to control access to data";
@@ -165993,14 +166095,19 @@ self: {
      }) {inherit (pkgs) libsodium;};
 
   "salve" = callPackage
-    ({ mkDerivation, base, criterion, deepseq, doctest, microlens }:
+    ({ mkDerivation, base, criterion, deepseq, doctest, microlens
+     , semver, semver-range
+     }:
      mkDerivation {
        pname = "salve";
-       version = "0.0.1";
-       sha256 = "1ay5cw3ambv5a23qrqq6j61v7gxd8mlkszhiamymaajqbgbsfzm1";
+       version = "0.0.5";
+       sha256 = "05m24awd4laqxh5mqbi1yzpmbnz2s8sh4xsz7j128dcxlsnrkldf";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest microlens ];
-       benchmarkHaskellDepends = [ base criterion deepseq ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq semver semver-range
+       ];
+       homepage = "https://github.com/tfausak/salve#readme";
        description = "Semantic version numbers and constraints";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -167135,30 +167242,6 @@ self: {
 
   "scientific" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, criterion
-     , deepseq, ghc-prim, hashable, integer-gmp, integer-logarithms
-     , primitive, QuickCheck, smallcheck, tasty, tasty-ant-xml
-     , tasty-hunit, tasty-quickcheck, tasty-smallcheck, text
-     }:
-     mkDerivation {
-       pname = "scientific";
-       version = "0.3.5.1";
-       sha256 = "19hvcqrrm375inqmci516xk32vir7dgw7ini8ij5rkdnrf1fd9jv";
-       libraryHaskellDepends = [
-         base binary bytestring containers deepseq ghc-prim hashable
-         integer-gmp integer-logarithms primitive text
-       ];
-       testHaskellDepends = [
-         base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml
-         tasty-hunit tasty-quickcheck tasty-smallcheck text
-       ];
-       benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/basvandijk/scientific";
-       description = "Numbers represented using scientific notation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "scientific_0_3_5_2" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, criterion
      , deepseq, hashable, integer-gmp, integer-logarithms, primitive
      , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit
      , tasty-quickcheck, tasty-smallcheck, text
@@ -167179,7 +167262,6 @@ self: {
        homepage = "https://github.com/basvandijk/scientific";
        description = "Numbers represented using scientific notation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scion" = callPackage
@@ -168053,8 +168135,8 @@ self: {
     ({ mkDerivation, base, bytestring, free, mtl, text }:
      mkDerivation {
        pname = "seakale";
-       version = "0.2.1.0";
-       sha256 = "0by7fykjqzj43cxv3z33pg7rq7dpn9f0a7nbaxz116qz12kk64a2";
+       version = "0.2.1.1";
+       sha256 = "0pb0d0y7cxry6np5412j7d2xm5wlp97gc15za3iqc7n38bdffjvy";
        libraryHaskellDepends = [ base bytestring free mtl text ];
        description = "Pure SQL layer on top of other libraries";
        license = stdenv.lib.licenses.bsd3;
@@ -168066,8 +168148,8 @@ self: {
      }:
      mkDerivation {
        pname = "seakale-postgresql";
-       version = "0.3.0.0";
-       sha256 = "0z3ai022yq2ff6yfp3a3s5xbxlchs2v4x6m86f8dgf28731gyynq";
+       version = "0.3.0.1";
+       sha256 = "1wrh1ix2ycyw7bcblxdmcydlaj10lp7ilwq8wg3csic4hpm2gy10";
        libraryHaskellDepends = [
          base bytestring free mtl postgresql-libpq seakale time
        ];
@@ -168081,8 +168163,8 @@ self: {
      }:
      mkDerivation {
        pname = "seakale-tests";
-       version = "0.1.1.0";
-       sha256 = "01famrx8xvfd8byikhliyrfhml91j264bnq456sxxwkmzs7gpy1n";
+       version = "0.1.1.1";
+       sha256 = "101z120wmxssxigbn8ax6311xfnhmflw9aa1pa6h4nswf3qran6q";
        libraryHaskellDepends = [
          base bytestring free mtl recursion-schemes seakale
        ];
@@ -169907,34 +169989,6 @@ self: {
      }:
      mkDerivation {
        pname = "servant-docs";
-       version = "0.10.0.1";
-       sha256 = "1lhfvlnpgliiv84pp0gjk1kzmrd66k9dsdxf1y7mwm4mq6r7qf7k";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-pretty base base-compat bytestring case-insensitive
-         control-monad-omega hashable http-media http-types lens servant
-         string-conversions text unordered-containers
-       ];
-       executableHaskellDepends = [
-         aeson base lens servant string-conversions text
-       ];
-       testHaskellDepends = [
-         aeson base hspec lens servant string-conversions
-       ];
-       homepage = "http://haskell-servant.readthedocs.org/";
-       description = "generate API docs for your servant webservice";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "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
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "servant-docs";
        version = "0.11";
        sha256 = "02bzp1bcvc54cx0kcnnsqqiva7rwbrn46a7gdxzqqiqrmm0a0fm0";
        isLibrary = true;
@@ -169953,7 +170007,6 @@ self: {
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "generate API docs for your servant webservice";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-ede" = callPackage
@@ -170405,30 +170458,6 @@ self: {
      }:
      mkDerivation {
        pname = "servant-purescript";
-       version = "0.8.0.0";
-       sha256 = "0h2a215i5lqalc4hp0g7iav3nxypdm5i2yfix0i96038sqjzg0wp";
-       libraryHaskellDepends = [
-         aeson base bytestring containers directory filepath http-types lens
-         mainland-pretty purescript-bridge servant servant-foreign
-         servant-server servant-subscriber text
-       ];
-       testHaskellDepends = [
-         aeson base containers lens mainland-pretty purescript-bridge
-         servant servant-foreign servant-subscriber text
-       ];
-       homepage = "https://github.com/eskimor/servant-purescript#readme";
-       description = "Generate PureScript accessor functions for you servant API";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-purescript_0_8_0_1" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, directory
-     , filepath, http-types, lens, mainland-pretty, purescript-bridge
-     , servant, servant-foreign, servant-server, servant-subscriber
-     , text
-     }:
-     mkDerivation {
-       pname = "servant-purescript";
        version = "0.8.0.1";
        sha256 = "12azs60ki6g002p5cz54cg84xr4kwhdf9z1r8bmx99xyvcpxynn5";
        libraryHaskellDepends = [
@@ -170443,7 +170472,6 @@ self: {
        homepage = "https://github.com/eskimor/servant-purescript#readme";
        description = "Generate PureScript accessor functions for you servant API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-pushbullet-client" = callPackage
@@ -175533,6 +175561,42 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "snap-core_1_0_3_1" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder
+     , case-insensitive, containers, deepseq, directory, filepath
+     , hashable, HUnit, io-streams, lifted-base, monad-control, mtl
+     , network, network-uri, old-locale, parallel, QuickCheck, random
+     , readable, regex-posix, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, time, transformers
+     , transformers-base, unix-compat, unordered-containers, vector
+     , zlib
+     }:
+     mkDerivation {
+       pname = "snap-core";
+       version = "1.0.3.1";
+       sha256 = "0m2pbz7r5dllk859r8bs3yjkmdh4xrw0vafz390jfmj15vaz0j87";
+       libraryHaskellDepends = [
+         attoparsec base bytestring bytestring-builder case-insensitive
+         containers directory filepath hashable HUnit io-streams lifted-base
+         monad-control mtl network network-uri old-locale random readable
+         regex-posix text time transformers transformers-base unix-compat
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring bytestring-builder case-insensitive
+         containers deepseq directory filepath hashable HUnit io-streams
+         lifted-base monad-control mtl network network-uri old-locale
+         parallel QuickCheck random readable regex-posix test-framework
+         test-framework-hunit test-framework-quickcheck2 text time
+         transformers transformers-base unix-compat unordered-containers
+         vector zlib
+       ];
+       homepage = "http://snapframework.com/";
+       description = "Snap: A Haskell Web Framework (core interfaces and types)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "snap-cors" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, case-insensitive
      , hashable, network, network-uri, snap, text, unordered-containers
@@ -175757,6 +175821,55 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "snap-server_1_0_3_1" = callPackage
+    ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder
+     , bytestring, bytestring-builder, case-insensitive, clock
+     , containers, criterion, deepseq, directory, filepath, HsOpenSSL
+     , http-common, http-streams, HUnit, io-streams, io-streams-haproxy
+     , lifted-base, monad-control, mtl, network, old-locale
+     , openssl-streams, parallel, QuickCheck, random, snap-core
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , text, threads, time, transformers, unix, unix-compat, vector
+     }:
+     mkDerivation {
+       pname = "snap-server";
+       version = "1.0.3.1";
+       sha256 = "0zawrbjncb5nbnahx70078sb9ai0dyqzghcn06qgy3vzk195gwfi";
+       configureFlags = [ "-fopenssl" ];
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base blaze-builder bytestring bytestring-builder
+         case-insensitive clock containers filepath HsOpenSSL io-streams
+         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
+         directory filepath HsOpenSSL http-common http-streams HUnit
+         io-streams io-streams-haproxy lifted-base monad-control mtl network
+         old-locale openssl-streams parallel QuickCheck random snap-core
+         test-framework test-framework-hunit test-framework-quickcheck2 text
+         threads time transformers unix unix-compat vector
+       ];
+       benchmarkHaskellDepends = [
+         attoparsec base blaze-builder bytestring bytestring-builder
+         criterion io-streams io-streams-haproxy snap-core vector
+       ];
+       homepage = "http://snapframework.com/";
+       description = "A web server for the Snap Framework";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "snap-templates" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory
      , directory-tree, filepath, hashable, old-time, template-haskell
@@ -178979,8 +179092,8 @@ self: {
      }:
      mkDerivation {
        pname = "squeeze";
-       version = "1.0.4.12";
-       sha256 = "1704hwgk2ly4ynvvmv7zi3pplqjw1gqdck8v9qa6dlr2q11z3ycv";
+       version = "1.0.4.13";
+       sha256 = "0s6qkfkm8vxqc3vwgzdhayalyrdgbybxw5p1imvsgn409i7vhiyd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -181354,58 +181467,6 @@ self: {
      }:
      mkDerivation {
        pname = "store";
-       version = "0.4.3.1";
-       sha256 = "0h8b91dpp4r1bhdq3k4zcnaby1ka9x6gy8ypbhv47b2mwpnwp09p";
-       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;
-     }) {};
-
-  "store_0_4_3_2" = 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.4.3.2";
        sha256 = "13ihh1n42j9lq2dhkcgisds7bzm7nm4a02abk8vadracn4a7r97c";
        libraryHaskellDepends = [
@@ -181442,7 +181503,6 @@ self: {
        homepage = "https://github.com/fpco/store#readme";
        description = "Fast binary serialization";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "store-core" = callPackage
@@ -183750,28 +183810,56 @@ self: {
        license = "unknown";
      }) {};
 
+  "swagger-petstore" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, case-insensitive
+     , containers, exceptions, hspec, http-api-data, http-client
+     , http-client-tls, http-media, http-types, iso8601-time
+     , monad-logger, mtl, network, QuickCheck, random, safe-exceptions
+     , semigroups, text, time, transformers, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "swagger-petstore";
+       version = "0.0.1.0";
+       sha256 = "1jpd0mxvdqw52dfk2nxvkhzn0ymdlbk99n2pgby7x66nv8vgs4n7";
+       libraryHaskellDepends = [
+         aeson base bytestring case-insensitive containers exceptions
+         http-api-data http-client http-client-tls http-media http-types
+         iso8601-time monad-logger mtl network random safe-exceptions text
+         time transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers hspec iso8601-time mtl QuickCheck
+         semigroups text time transformers unordered-containers
+       ];
+       homepage = "https://github.com/swagger-api/swagger-codegen#readme";
+       description = "Auto-generated swagger-petstore API Client";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "swagger-test" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
-     , case-insensitive, filepath, http-client, http-client-tls
-     , http-media, http-types, insert-ordered-containers, lens
-     , optparse-applicative, QuickCheck, random, scientific, swagger2
-     , syb, text, unordered-containers, vector
+    ({ mkDerivation, aeson, async, attoparsec, base, binary, blaze-html
+     , bytestring, case-insensitive, containers, directory, filepath
+     , http-client, http-client-tls, http-media, http-types
+     , insert-ordered-containers, lens, optparse-applicative, QuickCheck
+     , random, scientific, swagger2, syb, text, unordered-containers
+     , vector
      }:
      mkDerivation {
        pname = "swagger-test";
-       version = "0.1.0";
-       sha256 = "1w9i9hmycmzwfgnc9igmbqjgpamcf2bf0562n99d4z4fyi7j9dmm";
+       version = "0.2.3";
+       sha256 = "0hs1ylml6bjqmy697fhrbm83s7y5c2bz1zy8y1drvjms1lrlipgs";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson attoparsec base binary bytestring case-insensitive filepath
-         http-client http-client-tls http-media http-types
-         insert-ordered-containers lens QuickCheck scientific swagger2 syb
-         text unordered-containers vector
+         aeson async attoparsec base binary blaze-html bytestring
+         case-insensitive containers filepath http-client http-client-tls
+         http-media http-types insert-ordered-containers lens QuickCheck
+         random scientific swagger2 syb text unordered-containers vector
        ];
        executableHaskellDepends = [
-         aeson base bytestring lens optparse-applicative random swagger2
-         text
+         aeson async base bytestring directory filepath lens
+         optparse-applicative random swagger2 text
        ];
        homepage = "https://github.com/rodrigosetti/swagger-test";
        description = "Testing of Swagger APIs";
@@ -189539,17 +189627,17 @@ self: {
 
   "text1" = callPackage
     ({ mkDerivation, base, binary, directory, doctest, filepath, lens
-     , QuickCheck, semigroups, template-haskell, text
+     , papa, QuickCheck, semigroups, template-haskell, text
      }:
      mkDerivation {
        pname = "text1";
-       version = "0.0.4";
-       sha256 = "1v3vfg4h1fx14g8g9iggg6gq3b6j8h6q4l5pvs6v8zirmrdigc8p";
-       libraryHaskellDepends = [ base binary lens semigroups text ];
+       version = "0.0.5";
+       sha256 = "16rz92gvpn1gji6bknilklw397rr118rsdqxysk9wmj10alsxqsp";
+       libraryHaskellDepends = [ base binary lens papa semigroups text ];
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/NICTA/text1";
+       homepage = "https://github.com/qfpl/text1";
        description = "Non-empty values of `Data.Text`.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -189733,6 +189821,22 @@ self: {
        license = stdenv.lib.licenses.isc;
      }) {};
 
+  "th-abstraction_0_2_6_0" = callPackage
+    ({ mkDerivation, base, containers, ghc-prim, template-haskell }:
+     mkDerivation {
+       pname = "th-abstraction";
+       version = "0.2.6.0";
+       sha256 = "0g42h6wnj2awc5ryhbvx009wd8w75pn66bjzsq1z4s3xajd2hbp5";
+       libraryHaskellDepends = [
+         base containers ghc-prim template-haskell
+       ];
+       testHaskellDepends = [ base containers template-haskell ];
+       homepage = "https://github.com/glguy/th-abstraction";
+       description = "Nicer interface for reified information about data types";
+       license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "th-alpha" = callPackage
     ({ mkDerivation, base, containers, derive, mmorph, mtl, tasty
      , tasty-hunit, tasty-quickcheck, template-haskell, th-desugar
@@ -190130,8 +190234,8 @@ self: {
      }:
      mkDerivation {
        pname = "th-typegraph";
-       version = "1.0";
-       sha256 = "0p6cczd087lk8mxmax149d3zwmpskyj5ms0gdfdxff927q9g1aj6";
+       version = "1.0.2";
+       sha256 = "09yf7igwki0h7mv946x066955bj9154pfvqkmr3fy5j9j69gwin1";
        libraryHaskellDepends = [
          aeson base cereal containers fgl lens mtl parsec pretty safecopy
          split syb template-haskell text th-desugar th-lift
@@ -190580,23 +190684,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "threepenny-editors_0_5_4_1" = callPackage
-    ({ mkDerivation, base, bifunctors, casing, containers, data-default
-     , generics-sop, profunctors, threepenny-gui
+  "threepenny-editors_0_5_5" = callPackage
+    ({ mkDerivation, base, bifunctors, casing, containers, generics-sop
+     , profunctors, threepenny-gui
      }:
      mkDerivation {
        pname = "threepenny-editors";
-       version = "0.5.4.1";
-       sha256 = "0mfnyj1v4babbysxwhw63v8r8k4a6wfdza04q3d48mab8qs57ym2";
+       version = "0.5.5";
+       sha256 = "1gblkdkmkngry2fncjv4l7f3q614rw4p25cskf850kjgvcvm04fj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bifunctors casing containers data-default generics-sop
-         profunctors threepenny-gui
+         base bifunctors casing containers generics-sop profunctors
+         threepenny-gui
        ];
        executableHaskellDepends = [
-         base bifunctors casing containers data-default generics-sop
-         profunctors threepenny-gui
+         base bifunctors casing containers generics-sop profunctors
+         threepenny-gui
        ];
        homepage = "https://github.com/pepeiborra/threepenny-editors";
        description = "Composable algebraic editors";
@@ -190606,31 +190710,6 @@ self: {
 
   "threepenny-gui" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
-     , data-default, deepseq, exceptions, filepath, hashable
-     , network-uri, safe, snap-core, snap-server, stm, template-haskell
-     , text, transformers, unordered-containers, vault, vector
-     , websockets, websockets-snap
-     }:
-     mkDerivation {
-       pname = "threepenny-gui";
-       version = "0.8.0.1";
-       sha256 = "1jg18gmm4f3aamwz9vr3h8nc3axlxf2440zf0ff6h8dlp20al7zk";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson async base bytestring containers data-default deepseq
-         exceptions filepath hashable network-uri safe snap-core snap-server
-         stm template-haskell text transformers unordered-containers vault
-         vector websockets websockets-snap
-       ];
-       homepage = "http://wiki.haskell.org/Threepenny-gui";
-       description = "GUI framework that uses the web browser as a display";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "threepenny-gui_0_8_1_0" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, containers
      , data-default, deepseq, exceptions, file-embed, filepath, hashable
      , network-uri, safe, snap-core, snap-server, stm, template-haskell
      , text, transformers, unordered-containers, vault, vector
@@ -190652,7 +190731,6 @@ self: {
        homepage = "http://wiki.haskell.org/Threepenny-gui";
        description = "GUI framework that uses the web browser as a display";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "threepenny-gui-contextmenu" = callPackage
@@ -190733,6 +190811,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "throttle-io-stream" = callPackage
+    ({ mkDerivation, async, base, bytestring, clock, HUnit, say, stm
+     , stm-chans, test-framework, test-framework-hunit, text
+     }:
+     mkDerivation {
+       pname = "throttle-io-stream";
+       version = "0.2.0.1";
+       sha256 = "13icrx3nrgidnb7j3ixqz93rcsc63qmczkvjyg74pjrb0rlsi5z8";
+       libraryHaskellDepends = [ async base clock stm stm-chans ];
+       testHaskellDepends = [
+         async base bytestring clock HUnit say stm stm-chans test-framework
+         test-framework-hunit text
+       ];
+       homepage = "https://github.com/mtesseract/throttle-io-stream#readme";
+       description = "Throttler between arbitrary IO producer and consumer functions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "throttled-io-loop" = callPackage
     ({ mkDerivation, base, hspec, natural-numbers, QuickCheck, time }:
      mkDerivation {
@@ -194314,6 +194410,27 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "tsuntsun" = callPackage
+    ({ mkDerivation, base, conduit, conduit-combinators, conduit-extra
+     , directory, filepath, gtk3, optparse-applicative, resourcet, stm
+     , template-haskell, text, typed-process
+     }:
+     mkDerivation {
+       pname = "tsuntsun";
+       version = "0.2.0.0";
+       sha256 = "1pj8n0iy6cg4in09csnfvqzrx8s8ch6pvwxm2mq54ba8r0cpv7yz";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base conduit conduit-combinators conduit-extra directory filepath
+         gtk3 optparse-applicative resourcet stm template-haskell text
+         typed-process
+       ];
+       homepage = "https://github.com/Fuuzetsu/tsuntsun";
+       description = "Interacts with tesseract to ease reading of RAW Japanese manga";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "tsv2csv" = callPackage
     ({ mkDerivation, base, HUnit, split }:
      mkDerivation {
@@ -194700,7 +194817,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "turtle_1_4_2" = callPackage
+  "turtle_1_4_3" = callPackage
     ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
      , criterion, directory, doctest, foldl, hostname, managed
      , optional-args, optparse-applicative, process, semigroups, stm
@@ -194709,8 +194826,8 @@ self: {
      }:
      mkDerivation {
        pname = "turtle";
-       version = "1.4.2";
-       sha256 = "0zzc84k0126rnfm4sqb1a42n9carfq740vjnb7v7m5p1zf23x1f8";
+       version = "1.4.3";
+       sha256 = "0dyb99p1ymcjbpi0w3ksj0aj2pzs6fb6vp1n7m2bb1h5dp15rzrf";
        libraryHaskellDepends = [
          ansi-wl-pprint async base bytestring clock directory foldl hostname
          managed optional-args optparse-applicative process semigroups stm
@@ -194769,21 +194886,20 @@ self: {
      }) {};
 
   "twee" = callPackage
-    ({ mkDerivation, array, base, containers, dlist, ghc-prim, heaps
-     , jukebox, pretty, primitive, reflection, split, transformers
+    ({ mkDerivation, base, containers, dlist, ghc-prim, jukebox, pretty
+     , primitive, split, transformers
      }:
      mkDerivation {
        pname = "twee";
-       version = "0.1";
-       sha256 = "0bbyswnpvqnn2j1wp9ziyr3jc4kh77hh66pv9c8jx5xj1xdxf378";
+       version = "2.0";
+       sha256 = "18raccm4glf0gysj625wiwkk2b295863g0hgypc9335cxb65n8k0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         array base containers dlist ghc-prim heaps pretty primitive
-         reflection transformers
+         base containers dlist ghc-prim pretty primitive transformers
        ];
        executableHaskellDepends = [
-         array base containers jukebox pretty reflection split transformers
+         base containers jukebox pretty split
        ];
        homepage = "http://github.com/nick8325/twee";
        description = "An equational theorem prover";
@@ -197016,6 +197132,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "unconstrained" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "unconstrained";
+       version = "0.1.0.1";
+       sha256 = "0wzkf8fqlqd11rcb7cvb7zsyg1ws5wyplgmsll6xbfbh68adh32p";
+       libraryHaskellDepends = [ base ];
+       description = "Null constraint";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "unexceptionalio" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -198661,8 +198788,8 @@ self: {
      }:
      mkDerivation {
        pname = "uri-templater";
-       version = "0.2.1.0";
-       sha256 = "0g4l0g6277yr31x9g3fc3v4dpir01lmllp9rjbl67vfyqjhj31mi";
+       version = "0.2.2.0";
+       sha256 = "13dgpsiihlgd0k18bh67ssrv5hgmp38xwicfgss84rar47m61hw6";
        libraryHaskellDepends = [
          ansi-wl-pprint base charset containers dlist HTTP mtl parsers
          template-haskell text trifecta unordered-containers vector
@@ -198670,7 +198797,7 @@ self: {
        testHaskellDepends = [
          ansi-wl-pprint base HUnit mtl template-haskell
        ];
-       homepage = "http://github.com/iand675/uri-templater";
+       homepage = "https://github.com/iand675/uri-templater";
        description = "Parsing & Quasiquoting for RFC 6570 URI Templates";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -198825,6 +198952,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "urlpath_6_0_3" = callPackage
+    ({ mkDerivation, attoparsec-uri, base, exceptions, mmorph
+     , monad-control, monad-control-aligned, monad-logger, mtl
+     , path-extra, resourcet, split, strict, text, transformers
+     , transformers-base, vector
+     }:
+     mkDerivation {
+       pname = "urlpath";
+       version = "6.0.3";
+       sha256 = "0nyh47ra4y8q2pjbd1azkg0khqpq9qw2k8dxnhv4jf8jvjpf9zrk";
+       libraryHaskellDepends = [
+         attoparsec-uri base exceptions mmorph monad-control
+         monad-control-aligned monad-logger mtl path-extra resourcet split
+         strict text transformers transformers-base vector
+       ];
+       description = "Painfully simple URL deployment";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "urn" = callPackage
     ({ mkDerivation, base, hspec, parsec }:
      mkDerivation {
@@ -201487,6 +201634,25 @@ self: {
        license = "GPL";
      }) {};
 
+  "vivid-supercollider" = callPackage
+    ({ mkDerivation, base, binary, bytestring, cereal, microspec
+     , QuickCheck, split, utf8-string, vivid-osc
+     }:
+     mkDerivation {
+       pname = "vivid-supercollider";
+       version = "0.3.0.0";
+       sha256 = "15fkqjf3hfhc262slr5znh4f320lw68h318wr4sdprml0sy9xdw3";
+       libraryHaskellDepends = [
+         base binary bytestring cereal split utf8-string vivid-osc
+       ];
+       testHaskellDepends = [
+         base binary bytestring cereal microspec QuickCheck utf8-string
+         vivid-osc
+       ];
+       description = "Implementation of SuperCollider server specifications";
+       license = "GPL";
+     }) {};
+
   "vk-aws-route53" = callPackage
     ({ mkDerivation, aws, base, bytestring, containers, http-conduit
      , http-types, old-locale, resourcet, text, time, xml-conduit
@@ -202215,6 +202381,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wai-handler-launch_3_0_2_3" = callPackage
+    ({ mkDerivation, async, base, blaze-builder, bytestring, http-types
+     , process, streaming-commons, transformers, wai, warp
+     }:
+     mkDerivation {
+       pname = "wai-handler-launch";
+       version = "3.0.2.3";
+       sha256 = "1lv1xybpx7zzyz89nb94sw3326pnmyfz6h4sqs00ib9zf05hxl3d";
+       libraryHaskellDepends = [
+         async base blaze-builder bytestring http-types process
+         streaming-commons transformers wai warp
+       ];
+       description = "Launch a web app in the default browser";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-handler-scgi" = callPackage
     ({ mkDerivation, base, bytestring, wai, wai-extra }:
      mkDerivation {
@@ -202588,36 +202771,6 @@ self: {
 
   "wai-middleware-content-type" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, blaze-html, bytestring
-     , clay, exceptions, hashable, hspec, hspec-wai, http-media
-     , http-types, lucid, mmorph, monad-control, monad-logger, mtl
-     , pandoc, pandoc-types, resourcet, shakespeare, tasty, tasty-hspec
-     , text, transformers, transformers-base, unordered-containers
-     , urlpath, wai, wai-transformers, warp
-     }:
-     mkDerivation {
-       pname = "wai-middleware-content-type";
-       version = "0.5.0.1";
-       sha256 = "11mx11zl775amdbypn4gp3nk0zh1csj1hs750qmb9yzhb6wwrk9d";
-       libraryHaskellDepends = [
-         aeson base blaze-builder blaze-html bytestring clay exceptions
-         hashable http-media http-types lucid mmorph monad-control
-         monad-logger mtl pandoc resourcet shakespeare text transformers
-         transformers-base unordered-containers urlpath wai wai-transformers
-       ];
-       testHaskellDepends = [
-         aeson base blaze-builder blaze-html bytestring clay exceptions
-         hashable hspec hspec-wai http-media http-types lucid mmorph
-         monad-control monad-logger mtl pandoc pandoc-types resourcet
-         shakespeare tasty tasty-hspec text transformers transformers-base
-         unordered-containers urlpath wai wai-transformers warp
-       ];
-       description = "Route to different middlewares based on the incoming Accept header";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "wai-middleware-content-type_0_5_1" = callPackage
-    ({ mkDerivation, aeson, base, blaze-builder, blaze-html, bytestring
      , clay, exceptions, extractable-singleton, hashable, hspec
      , hspec-wai, http-media, http-types, lucid, mmorph, monad-control
      , monad-control-aligned, monad-logger, mtl, pandoc, pandoc-types
@@ -203199,8 +203352,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-secure-cookies";
-       version = "0.1.0.1";
-       sha256 = "0i6ipcyqfndakr42d4cbskv5zkg1kizkhl46wi6km0l8lzbc42l4";
+       version = "0.1.0.2";
+       sha256 = "0lp8g8v122kqp2ps1w13hhcxm0p0xjkqjsdk9hm7xyc4k78x5lvb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -208640,6 +208793,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "xmonad-extras_0_13_1" = callPackage
+    ({ mkDerivation, alsa-mixer, base, bytestring, containers, hint
+     , libmpd, mtl, network, regex-posix, X11, xmonad, xmonad-contrib
+     }:
+     mkDerivation {
+       pname = "xmonad-extras";
+       version = "0.13.1";
+       sha256 = "09qwcfb84r4k65vzv99syy4434pa3pchv1i4mm1qs03b5c835jh0";
+       configureFlags = [
+         "-f-with_hlist" "-fwith_parsec" "-fwith_split"
+       ];
+       libraryHaskellDepends = [
+         alsa-mixer base bytestring containers hint libmpd mtl network
+         regex-posix X11 xmonad xmonad-contrib
+       ];
+       homepage = "https://github.com/xmonad/xmonad-extras";
+       description = "Third party extensions for xmonad with wacky dependencies";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "xmonad-screenshot" = callPackage
     ({ mkDerivation, base, gtk, xmonad }:
      mkDerivation {
@@ -209867,35 +210041,6 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth";
-       version = "1.4.17.3";
-       sha256 = "16z4rqzy8gzri6sbgm5cx3vm44myx2bzydfyhi91yd6ravi7rc9i";
-       libraryHaskellDepends = [
-         aeson authenticate base base16-bytestring base64-bytestring binary
-         blaze-builder blaze-html blaze-markup byteable bytestring conduit
-         conduit-extra containers cryptonite data-default email-validate
-         file-embed http-client http-conduit http-types lifted-base memory
-         mime-mail network-uri nonce persistent persistent-template random
-         resourcet safe shakespeare template-haskell text time transformers
-         unordered-containers wai yesod-core yesod-form yesod-persistent
-       ];
-       homepage = "http://www.yesodweb.com/";
-       description = "Authentication for Yesod";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-auth_1_4_18" = callPackage
-    ({ mkDerivation, aeson, authenticate, base, base16-bytestring
-     , base64-bytestring, binary, blaze-builder, blaze-html
-     , blaze-markup, byteable, bytestring, conduit, conduit-extra
-     , containers, cryptonite, data-default, email-validate, file-embed
-     , http-client, http-conduit, http-types, lifted-base, memory
-     , mime-mail, network-uri, nonce, persistent, persistent-template
-     , random, resourcet, safe, shakespeare, template-haskell, text
-     , time, transformers, unordered-containers, wai, yesod-core
-     , yesod-form, yesod-persistent
-     }:
-     mkDerivation {
-       pname = "yesod-auth";
        version = "1.4.18";
        sha256 = "1cg3wb5d8cy65rmrc0dq086mmfhvvwdyig926pb0nhn2zj2kbzav";
        libraryHaskellDepends = [
@@ -209910,7 +210055,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Authentication for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-account" = callPackage
@@ -210042,32 +210186,6 @@ self: {
   "yesod-auth-hashdb" = callPackage
     ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers
      , hspec, http-conduit, http-types, monad-logger, network-uri
-     , persistent, persistent-sqlite, pwstore-fast, resourcet, text
-     , unordered-containers, wai-extra, yesod, yesod-auth, yesod-core
-     , yesod-form, yesod-persistent, yesod-test
-     }:
-     mkDerivation {
-       pname = "yesod-auth-hashdb";
-       version = "1.6.1";
-       sha256 = "1y2ssd11a4fgxcqa8djvkivv7x6h0s4frm3a9nvsqi76lkg0ai39";
-       libraryHaskellDepends = [
-         aeson base bytestring persistent pwstore-fast text yesod-auth
-         yesod-core yesod-form yesod-persistent
-       ];
-       testHaskellDepends = [
-         aeson base basic-prelude bytestring containers hspec http-conduit
-         http-types monad-logger network-uri persistent-sqlite resourcet
-         text unordered-containers wai-extra yesod yesod-auth yesod-core
-         yesod-test
-       ];
-       homepage = "https://github.com/paul-rouse/yesod-auth-hashdb";
-       description = "Authentication plugin for Yesod";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-auth-hashdb_1_6_2" = callPackage
-    ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers
-     , hspec, http-conduit, http-types, monad-logger, network-uri
      , persistent, persistent-sqlite, resourcet, text
      , unordered-containers, wai-extra, yesod, yesod-auth, yesod-core
      , yesod-form, yesod-persistent, yesod-test
@@ -210089,7 +210207,6 @@ self: {
        homepage = "https://github.com/paul-rouse/yesod-auth-hashdb";
        description = "Authentication plugin for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-hmac-keccak" = callPackage
@@ -211814,8 +211931,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi";
-       version = "0.14.1";
-       sha256 = "0l42knqinklyavsg4ygrdikziflal0x2l4j218rrq7yvr5qll4n5";
+       version = "0.15.0";
+       sha256 = "1mkdpc4fg7qx8mslcmjwnws24hr5p7289v026qf0m6ivc4dkbkbi";
        configureFlags = [ "-fpango" "-fvty" ];
        isLibrary = false;
        isExecutable = true;
@@ -211893,14 +212010,58 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "yi-core_0_15_0" = callPackage
+    ({ mkDerivation, array, attoparsec, base, binary, bytestring
+     , containers, criterion, data-default, deepseq, directory, dlist
+     , dynamic-state, filepath, hashable, ListLike, microlens-platform
+     , mtl, old-locale, oo-prototypes, parsec, pointedlist, process
+     , process-extras, quickcheck-text, split, tasty, tasty-hunit
+     , tasty-quickcheck, text, text-icu, time, transformers-base, unix
+     , unix-compat, unordered-containers, xdg-basedir, yi-language
+     , yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-core";
+       version = "0.15.0";
+       sha256 = "1lfxqi7z2jhvg6mzh31nighgcq1zp4w2ibggqlq02wbliwvbvbsf";
+       libraryHaskellDepends = [
+         array attoparsec base binary bytestring containers data-default
+         directory dlist dynamic-state filepath hashable ListLike
+         microlens-platform mtl old-locale oo-prototypes parsec pointedlist
+         process process-extras split text text-icu time transformers-base
+         unix unix-compat unordered-containers xdg-basedir yi-language
+         yi-rope
+       ];
+       testHaskellDepends = [
+         array attoparsec base binary bytestring containers data-default
+         directory dlist dynamic-state filepath hashable ListLike
+         microlens-platform mtl old-locale oo-prototypes parsec pointedlist
+         process process-extras quickcheck-text split tasty tasty-hunit
+         tasty-quickcheck text text-icu time transformers-base unix
+         unix-compat unordered-containers xdg-basedir yi-language yi-rope
+       ];
+       benchmarkHaskellDepends = [
+         array attoparsec base binary bytestring containers criterion
+         data-default deepseq directory dlist dynamic-state filepath
+         hashable ListLike microlens-platform mtl old-locale oo-prototypes
+         parsec pointedlist process process-extras split text text-icu time
+         transformers-base unix unix-compat unordered-containers xdg-basedir
+         yi-language yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Yi editor core library";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-dynamic-configuration" = callPackage
     ({ mkDerivation, base, dyre, microlens-platform, mtl, text
      , transformers-base, yi-core, yi-rope
      }:
      mkDerivation {
        pname = "yi-dynamic-configuration";
-       version = "0.14.1";
-       sha256 = "0dpkp554s8hk09x74krix34g0iw2p77xqp23xrpcsn2yrd38i0bw";
+       version = "0.15.0";
+       sha256 = "0dh8vvmczdlcby9ybp89r59mhi1p7ywrvrh36y0nz6zmfckx3ylh";
        libraryHaskellDepends = [
          base dyre microlens-platform mtl text transformers-base yi-core
          yi-rope
@@ -211930,8 +212091,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-frontend-pango";
-       version = "0.14.1";
-       sha256 = "1rppsmwinczvjlji38cwz11g3h1xzqdjxvz7pimbzfsbccl2wjj3";
+       version = "0.15.0";
+       sha256 = "02wfcpsamqq5qxdzmbg98h4qji9dfsvk3v4rq1r9lxw6v3rcnd8h";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers filepath glib gtk microlens-platform mtl
@@ -211961,6 +212122,25 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "yi-frontend-vty_0_15_0" = callPackage
+    ({ mkDerivation, base, containers, data-default, dlist
+     , microlens-platform, pointedlist, stm, text, vty, yi-core
+     , yi-language, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-frontend-vty";
+       version = "0.15.0";
+       sha256 = "0c8qvhn22r1bk9p5c65z8dq73hn84ylpxczqyjb1j8i76wycaccc";
+       libraryHaskellDepends = [
+         base containers data-default dlist microlens-platform pointedlist
+         stm text vty yi-core yi-language yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Vty frontend for Yi editor";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-fuzzy-open" = callPackage
     ({ mkDerivation, base, binary, containers, data-default, directory
      , filepath, mtl, text, transformers-base, vector, yi-core
@@ -211979,6 +212159,25 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "yi-fuzzy-open_0_15_0" = callPackage
+    ({ mkDerivation, base, binary, containers, data-default, directory
+     , filepath, mtl, text, transformers-base, vector, yi-core
+     , yi-language, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-fuzzy-open";
+       version = "0.15.0";
+       sha256 = "0zlscdkxahcdh46pgnlv2v55s5c7271zc43fi37ff305a9d57axq";
+       libraryHaskellDepends = [
+         base binary containers data-default directory filepath mtl text
+         transformers-base vector yi-core yi-language yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Fuzzy open plugin for yi";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-gtk" = callPackage
     ({ mkDerivation }:
      mkDerivation {
@@ -212008,6 +212207,24 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "yi-ireader_0_15_0" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, data-default
+     , microlens-platform, text, yi-core, yi-language, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-ireader";
+       version = "0.15.0";
+       sha256 = "05jmsdr4bv14mpjzsb2ib20jvmswgm0666d8vz0h2gp2gvda7skd";
+       libraryHaskellDepends = [
+         base binary bytestring containers data-default microlens-platform
+         text yi-core yi-language yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Yi editor incremental reader";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-keymap-cua" = callPackage
     ({ mkDerivation, base, microlens-platform, text, yi-core
      , yi-keymap-emacs, yi-rope
@@ -212024,6 +212241,23 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "yi-keymap-cua_0_15_0" = callPackage
+    ({ mkDerivation, base, microlens-platform, text, yi-core
+     , yi-keymap-emacs, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-keymap-cua";
+       version = "0.15.0";
+       sha256 = "0wxblxk9pf3i7dc3hl64lwicj1njwvl8qkimkqw20k3si7hls2vz";
+       libraryHaskellDepends = [
+         base microlens-platform text yi-core yi-keymap-emacs yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Cua keymap for Yi editor";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-keymap-emacs" = callPackage
     ({ mkDerivation, base, containers, filepath, Hclip
      , microlens-platform, mtl, oo-prototypes, semigroups, text
@@ -212043,6 +212277,25 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "yi-keymap-emacs_0_15_0" = callPackage
+    ({ mkDerivation, base, containers, filepath, Hclip
+     , microlens-platform, mtl, oo-prototypes, text, transformers-base
+     , yi-core, yi-language, yi-misc-modes, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-keymap-emacs";
+       version = "0.15.0";
+       sha256 = "1sfyddp123zi3inwnilnckf9gair13kn1qjj6k117g1900fh4ha5";
+       libraryHaskellDepends = [
+         base containers filepath Hclip microlens-platform mtl oo-prototypes
+         text transformers-base yi-core yi-language yi-misc-modes yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Emacs keymap for Yi editor";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-keymap-vim" = callPackage
     ({ mkDerivation, attoparsec, base, binary, containers, data-default
      , directory, filepath, Hclip, microlens-platform, mtl
@@ -212072,6 +212325,35 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "yi-keymap-vim_0_15_0" = callPackage
+    ({ mkDerivation, attoparsec, base, binary, containers, data-default
+     , directory, filepath, Hclip, microlens-platform, mtl
+     , oo-prototypes, pointedlist, QuickCheck, safe, tasty, tasty-hunit
+     , tasty-quickcheck, text, transformers-base, unordered-containers
+     , yi-core, yi-language, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-keymap-vim";
+       version = "0.15.0";
+       sha256 = "0jd4ssf97zq6rzsdlxj0framwzdkf5ggnzkafk7wvd9abikihmld";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         attoparsec base binary containers data-default directory filepath
+         Hclip microlens-platform mtl oo-prototypes pointedlist safe text
+         transformers-base unordered-containers yi-core yi-language yi-rope
+       ];
+       testHaskellDepends = [
+         attoparsec base binary containers data-default directory filepath
+         Hclip microlens-platform mtl oo-prototypes pointedlist QuickCheck
+         safe tasty tasty-hunit tasty-quickcheck text transformers-base
+         unordered-containers yi-core yi-language yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Vim keymap for Yi editor";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-language" = callPackage
     ({ mkDerivation, alex, array, base, binary, containers
      , data-default, hashable, microlens-platform, oo-prototypes
@@ -212100,6 +212382,35 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "yi-language_0_15_0" = callPackage
+    ({ mkDerivation, alex, array, base, binary, containers
+     , data-default, hashable, microlens-platform, oo-prototypes
+     , pointedlist, regex-base, regex-tdfa, tasty, tasty-hspec
+     , tasty-quickcheck, template-haskell, transformers-base
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "yi-language";
+       version = "0.15.0";
+       sha256 = "0skp7n9l4qg665krs6fv7kxmrq7jrbrqv1lppcqff5bak1dk5vxb";
+       libraryHaskellDepends = [
+         array base binary containers data-default hashable
+         microlens-platform oo-prototypes pointedlist regex-base regex-tdfa
+         template-haskell transformers-base unordered-containers
+       ];
+       libraryToolDepends = [ alex ];
+       testHaskellDepends = [
+         array base binary containers data-default hashable
+         microlens-platform pointedlist regex-base regex-tdfa tasty
+         tasty-hspec tasty-quickcheck template-haskell transformers-base
+         unordered-containers
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Collection of language-related Yi libraries";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-misc-modes" = callPackage
     ({ mkDerivation, alex, array, base, binary, data-default, filepath
      , microlens-platform, semigroups, text, yi-core, yi-language
@@ -212119,6 +212430,25 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "yi-misc-modes_0_15_0" = callPackage
+    ({ mkDerivation, alex, array, base, binary, data-default, filepath
+     , microlens-platform, text, yi-core, yi-language, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-misc-modes";
+       version = "0.15.0";
+       sha256 = "0rjk5j3jrqvbznh5azc49wgx6i21q30qn0jz1rvhqqxsakqyaqbx";
+       libraryHaskellDepends = [
+         array base binary data-default filepath microlens-platform text
+         yi-core yi-language yi-rope
+       ];
+       libraryToolDepends = [ alex ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Yi editor miscellaneous modes";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-mode-haskell" = callPackage
     ({ mkDerivation, alex, array, base, binary, data-default, filepath
      , microlens-platform, text, yi-core, yi-language, yi-rope
@@ -212137,6 +212467,25 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "yi-mode-haskell_0_15_0" = callPackage
+    ({ mkDerivation, alex, array, base, binary, data-default, filepath
+     , microlens-platform, text, yi-core, yi-language, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-mode-haskell";
+       version = "0.15.0";
+       sha256 = "12h3ij0a887jfz9kcmmsl0i82jimf11pcvshimdk7d3c9gqf8ygn";
+       libraryHaskellDepends = [
+         array base binary data-default filepath microlens-platform text
+         yi-core yi-language yi-rope
+       ];
+       libraryToolDepends = [ alex ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Yi editor haskell mode";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-mode-javascript" = callPackage
     ({ mkDerivation, alex, array, base, binary, data-default, dlist
      , filepath, microlens-platform, mtl, text, yi-core, yi-language
@@ -212156,6 +212505,26 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "yi-mode-javascript_0_15_0" = callPackage
+    ({ mkDerivation, alex, array, base, binary, data-default, dlist
+     , filepath, microlens-platform, mtl, text, yi-core, yi-language
+     , yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-mode-javascript";
+       version = "0.15.0";
+       sha256 = "0ir6m97v3d42j6my5pg52vnbwlr55sgzidajx23mlafnccl9j6js";
+       libraryHaskellDepends = [
+         array base binary data-default dlist filepath microlens-platform
+         mtl text yi-core yi-language yi-rope
+       ];
+       libraryToolDepends = [ alex ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Yi editor javascript mode";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-monokai" = callPackage
     ({ mkDerivation, base, yi }:
      mkDerivation {
@@ -212211,6 +212580,28 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "yi-snippet_0_15_0" = callPackage
+    ({ mkDerivation, base, binary, containers, data-default, free
+     , microlens-platform, mtl, tasty-hunit, tasty-th, text, vector
+     , yi-core, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-snippet";
+       version = "0.15.0";
+       sha256 = "06cnnjbqkd03d5hzs80gm2bp0nzqnfd74ypzc35a8ad6wjdwsvnw";
+       libraryHaskellDepends = [
+         base binary containers data-default free microlens-platform mtl
+         text vector yi-core yi-rope
+       ];
+       testHaskellDepends = [
+         base containers tasty-hunit tasty-th yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Snippet support for yi";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-solarized" = callPackage
     ({ mkDerivation, base, yi }:
      mkDerivation {
diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index fbfd5ae6b94..48110cffabf 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -142,8 +142,4 @@ rec {
   overrideSrc = drv: { src, version ? drv.version }:
     overrideCabal drv (_: { inherit src version; editedCabalFile = null; });
 
-  hasNoBinOutput = drv: overrideCabal drv (drv: { enableSeparateBinOutput = false; });
-
-  installOutputs = drv: outputs: overrideCabal drv
-    (drv: { outputsToInstall = outputs; });
 }
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index 444a4899a04..ff5be894b92 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -44,7 +44,6 @@ let
       isLibrary = false;
       doHaddock = false;
       hyperlinkSource = false;      # Avoid depending on hscolour for this build.
-      enableSeparateEtcOutput = false; # The flag to support this is missing in old versions of cabal.
       postFixup = "rm -rf $out/lib $out/share $out/nix-support";
     });
     cpphs = overrideCabal (self.cpphs.overrideScope (self: super: {
diff --git a/pkgs/development/libraries/libfpx/default.nix b/pkgs/development/libraries/libfpx/default.nix
index 0a7a1d462ee..28e1ad895b4 100644
--- a/pkgs/development/libraries/libfpx/default.nix
+++ b/pkgs/development/libraries/libfpx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, fetchpatch }:
 
 stdenv.mkDerivation rec {
   name = "libfpx-1.3.1-7";
@@ -11,6 +11,13 @@ stdenv.mkDerivation rec {
   # Darwin gets misdetected as Windows without this
   NIX_CFLAGS_COMPILE = if stdenv.isDarwin then "-D__unix" else null;
 
+  patches = [
+    (fetchpatch {
+      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/libfpx/files/libfpx-1.3.1_p6-gcc6.patch?id=f28a947813dbc0a1fd1a8d4a712d58a64c48ca01";
+      sha256 = "032y8110zgnkdhkdq3745zk53am1x34d912rai8q70k3sskyq22p";
+    })
+  ];
+
   # This dead code causes a duplicate symbol error in Clang so just remove it
   postPatch = if stdenv.cc.isClang then ''
     substituteInPlace jpeg/ejpeg.h --replace "int No_JPEG_Header_Flag" ""
diff --git a/pkgs/development/libraries/silgraphite/default.nix b/pkgs/development/libraries/silgraphite/default.nix
deleted file mode 100644
index 05db104ecb7..00000000000
--- a/pkgs/development/libraries/silgraphite/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, freetype, libXft, pango, fontconfig }:
-
-stdenv.mkDerivation rec {
-  version = "2.3.1";
-  name = "silgraphite-2.3.1";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/silgraphite/silgraphite/${version}/${name}.tar.gz";
-    sha256 = "9b07c6e91108b1fa87411af4a57e25522784cfea0deb79b34ced608444f2ed65";
-  };
-
-  buildInputs = [pkgconfig freetype libXft pango fontconfig];
-
-  NIX_CFLAGS_COMPILE = "-I${freetype.dev}/include/freetype2";
-
-  meta = {
-    description = "An advanced font engine";
-    maintainers = [ stdenv.lib.maintainers.raskin ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/development/python-modules/marionette-harness/manifestparser.nix b/pkgs/development/python-modules/marionette-harness/manifestparser.nix
index 9e418af8a71..766e419e514 100644
--- a/pkgs/development/python-modules/marionette-harness/manifestparser.nix
+++ b/pkgs/development/python-modules/marionette-harness/manifestparser.nix
@@ -2,6 +2,7 @@
 , stdenv
 , buildPythonPackage
 , fetchPypi
+, isPy3k
 }:
 
 buildPythonPackage rec {
@@ -9,6 +10,8 @@ buildPythonPackage rec {
   version = "1.1";
   name = "${pname}-${version}";
 
+  disabled = isPy3k;
+
   src = fetchPypi {
     inherit pname version;
     sha256 = "06cnj682ynacwpi63k1427vbf7ydnwh3dchc4b11yw8ii25wbc5d";
diff --git a/pkgs/development/python-modules/wptserve/default.nix b/pkgs/development/python-modules/wptserve/default.nix
index 44f3480aec6..d468955e27d 100644
--- a/pkgs/development/python-modules/wptserve/default.nix
+++ b/pkgs/development/python-modules/wptserve/default.nix
@@ -2,6 +2,7 @@
 , stdenv
 , buildPythonPackage
 , fetchPypi
+, isPy3k
 }:
 
 buildPythonPackage rec {
@@ -9,6 +10,8 @@ buildPythonPackage rec {
   version = "1.4.0";
   name = "${pname}-${version}";
 
+  disabled = isPy3k;
+
   src = fetchPypi {
     inherit pname version;
     sha256 = "0rkq4dpl41hx64m3ad0bwn0r5i7sf8qpgazgkq905j3wgk5aaspg";
diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix
index b9e6a0e2d81..59cdf443f4a 100644
--- a/pkgs/development/tools/rust/rustup/default.nix
+++ b/pkgs/development/tools/rust/rustup/default.nix
@@ -4,15 +4,15 @@
 
 rustPlatform.buildRustPackage rec {
   name = "rustup-${version}";
-  version = "1.2.0";
+  version = "1.3.0";
 
-  depsSha256 = "06bfz5kyj3k0yxv55dq0s1arx34sy1jjfrpgd83rf99026vcm5x2";
+  depsSha256 = "078hssgffgpakv735p1xg60kic151r2dvpdr9sipb63lwqr4dxfb";
 
   src = fetchFromGitHub {
     owner = "rust-lang-nursery";
     repo = "rustup.rs";
     rev = version;
-    sha256 = "0qwl27wh7j03h511bd8fq5fif5xcmkiyy9rm3hri7czjqr01mw0v";
+    sha256 = "199jlqqidzak7nxmv2nzjzv7zfzy9z7hw6h8d8wf1rbfdwd9l6hs";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix
index 46ffbe17638..e8db1de7628 100644
--- a/pkgs/games/factorio/default.nix
+++ b/pkgs/games/factorio/default.nix
@@ -6,36 +6,46 @@
 , username ? "" , password ? ""
 }:
 
-assert releaseType == "alpha" || releaseType == "headless" || releaseType == "demo";
+assert releaseType == "alpha"
+    || releaseType == "headless"
+    || releaseType == "demo";
 
-with stdenv.lib;
 let
-  version = if releaseType != "demo" then "0.15.33" else "0.15.33";
 
-  arch = if stdenv.system == "x86_64-linux" then {
-    inUrl = "linux64";
-    inTar = "x64";
-  } else if stdenv.system == "i686-linux" then {
-    inUrl = "linux32";
-    inTar = "i386";
-  } else abort "Unsupported platform";
-
-  authenticatedFetch = callPackage ./fetch.nix { inherit username password; };
-
-  fetch = rec {
-    url = "https://www.factorio.com/get-download/${version}/${releaseType}/${arch.inUrl}";
-    name = "factorio_${releaseType}_${arch.inTar}-${version}.tar.xz";
-    x64 = {
-      headless =           fetchurl { inherit name url; sha256 = "17x0dlmfd7jwmpmn5i8wag28rl01iysqz3ri6g6msxjnvj5l6byn"; };
-      alpha    = authenticatedFetch { inherit name url; sha256 = "1m2r0n99ngqq47s9fzr09d347i15an6x9v1qlij8yf8w7lyrdy4z"; };
-      demo     =           fetchurl { inherit name url; sha256 = "03nwn4838yhqq0r76pf2m4wxi32rsq0knsxmq3qq4ycji89q1dyc"; };
+  # NB If you nix-prefetch-url any of these, be sure to add a --name arg,
+  #    where the ultimate "_" (before the version) is changed to a "-".
+  binDists = {
+    x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in {
+      alpha    = bdist { sha256 = "0phikwv00mbwpz4207wm6gz6blarm0b9p1f013ha2w5g7c2dxq4s"; fetcher = authenticatedFetch; };
+      headless = bdist { sha256 = "1m170cl8ji6k3d3jm6n48wx3b7xfsxp4wkaixh0qszaqzafsglp0"; };
+      demo     = bdist { sha256 = "03nwn4838yhqq0r76pf2m4wxi32rsq0knsxmq3qq4ycji89q1dyc"; version = "0.15.33"; };
     };
-    i386 = {
-      headless = abort "Factorio 32-bit headless binaries are not available for download.";
-      alpha    = abort "Factorio 32-bit client is not available for this version.";
-      demo     = abort "Factorio 32-bit demo binaries are not available for download.";
+    i686-linux = let bdist = bdistForArch { inUrl = "linux32"; inTar = "i386"; }; in {
+      alpha    = bdist { sha256 = "0nnfkxxqnywx1z05xnndgh71gp4izmwdk026nnjih74m2k5j086l"; version = "0.14.23"; nameMut = asGz; };
+      headless = bdist { };
+      demo     = bdist { };
     };
   };
+  actual = binDists.${stdenv.system}.${releaseType};
+
+  bdistForArch = arch: { sha256 ? null
+                       , version ? "0.15.34"
+                       , fetcher ? fetchurl
+                       , nameMut ? x: x
+                       }:
+    if sha256 == null then
+      abort "Factorio ${releaseType}-${arch.inTar} binaries are not (and were never?) available to download"
+    else {
+      inherit version arch;
+      src = fetcher {
+        inherit sha256;
+        url = "https://www.factorio.com/get-download/${version}/${releaseType}/${arch.inUrl}";
+        name = nameMut "factorio_${releaseType}_${arch.inTar}-${version}.tar.xz";
+      };
+    };
+  authenticatedFetch = callPackage ./fetch.nix { inherit username password; };
+  asGz = builtins.replaceStrings [".xz"] [".gz"];
+
 
   configBaseCfg = ''
     use-system-read-write-data-directories=false
@@ -59,10 +69,10 @@ let
 
   modDir = factorio-utils.mkModDirDrv mods;
 
-  base = {
+  base = with actual; {
     name = "factorio-${releaseType}-${version}";
 
-    src = fetch.${arch.inTar}.${releaseType};
+    inherit src;
 
     preferLocalBuild = true;
     dontBuild = true;
@@ -117,8 +127,9 @@ let
         wrapProgram $out/bin/factorio                                \
           --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:$libPath \
           --run "$out/share/factorio/update-config.sh"               \
-          --argv0 "" \
-          --add-flags "-c \$HOME/.factorio/config.cfg ${optionalString (mods != []) "--mod-directory=${modDir}"}"
+          --argv0 ""                                                 \
+          --add-flags "-c \$HOME/.factorio/config.cfg"               \
+          ${if mods!=[] then "--add-flags --mod-directory=${modDir}" else ""}
 
           # TODO Currently, every time a mod is changed/added/removed using the
           # modlist, a new derivation will take up the entire footprint of the
@@ -154,4 +165,5 @@ let
       '';
     };
   };
+
 in stdenv.mkDerivation (releases.${releaseType})
diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index d37cc93dfcd..438eb8e02ec 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -47,8 +47,8 @@ in rec {
   };
 
   winetricks = fetchFromGitHub rec {
-    version = "20170614";
-    sha256 = "1xszflrdmixxr0v7vjby8fpnl8fgc9gldr1gnjpwzq1rnb84idqa";
+    version = "20170823";
+    sha256 = "15kjic39nl3z4g9l9galwkajl108fxfwaa0d9nssp54wg6villwx";
     owner = "Winetricks";
     repo = "winetricks";
     rev = version;
diff --git a/pkgs/misc/themes/arc/default.nix b/pkgs/misc/themes/arc/default.nix
index a277c796eb4..6598abe73e8 100644
--- a/pkgs/misc/themes/arc/default.nix
+++ b/pkgs/misc/themes/arc/default.nix
@@ -1,14 +1,18 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gnome3, gtk-engine-murrine }:
 
-stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
+let
+  # treat versions newer than 3.22 as 3.22
+  gnomeVersion = if stdenv.lib.versionOlder "3.22" gnome3.version then "3.22" else gnome3.version;
   pname = "arc-theme";
+
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
   version = "2017-05-12";
 
   src = fetchFromGitHub {
-    owner = "horst3180";
-    repo = pname;
-    rev = "8290cb813f157a22e64ae58ac3dfb5983b0416e6";
+    owner  = "horst3180";
+    repo   = pname;
+    rev    = "8290cb813f157a22e64ae58ac3dfb5983b0416e6";
     sha256 = "1lxiw5iq9n62xzs0fks572c5vkz202jigndxaankxb44wcgn9zyf";
   };
 
@@ -18,7 +22,7 @@ stdenv.mkDerivation rec {
 
   preferLocalBuild = true;
 
-  configureFlags = [ "--disable-unity" ];
+  configureFlags = [ "--disable-unity" "--with-gnome=${gnomeVersion}" ];
 
   postInstall = ''
     mkdir -p $out/share/plank/themes
@@ -30,9 +34,9 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A flat theme with transparent elements for GTK 3, GTK 2 and Gnome-Shell";
-    homepage = https://github.com/horst3180/arc-theme;
-    license = licenses.gpl3;
-    platforms = platforms.unix;
+    homepage    = https://github.com/horst3180/arc-theme;
+    license     = licenses.gpl3;
     maintainers = with maintainers; [ simonvandel romildo ];
+    platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 307c661ddf4..22ceb1b2378 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -6,11 +6,11 @@ in
 {
   # Policy: use the highest stable version as the default (on our master).
   stable = generic {
-    version = "375.66";
-    sha256_32bit = "0k7ib5ah3c2apzgzxlq75l48zm8901mbwj7slv18k3rhk8j0w8i9";
-    sha256_64bit = "1h01s8brpz42jwc24dsflm4psd3zsy26ds98h0adgwx51dbpzqsr";
-    settingsSha256 = "0bpdayyqw4cpgl7bgddfz6w5j8y3wsgr89p5vxnzgk9g0vgqxh5h";
-    persistencedSha256 = "113rllf9l26z546jjfijpxllp17qcpawblzxvsqc6rbzbkmvcdwi";
+    version = "384.69";
+    sha256_32bit = "1zgq9vji0ndadvql3bsnd0a6p7pq0vr8d0yb5c8b22i2h9smhw1v";
+    sha256_64bit = "0l3np6cx2rnb2q89zbnq4lvfcjl2g7i56hxwcb11ggijqm7ridx7";
+    settingsSha256 = "064va75p7dnkhy4hyi9b1gl4wjmrpjksg4cyiwl6n3lkmjnvmnwy";
+    persistencedSha256 = "0ijq25gnihw34qhkba62l5fy6lwkma94i0fxp8084byyilm3fwms";
   };
 
   beta = generic {
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 56d2f854654..ccf5e7fea0a 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:
 
 buildGoPackage rec {
-  version = "4.3.2";
+  version = "4.4.3";
   name = "grafana-v${version}";
   goPackagePath = "github.com/grafana/grafana";
 
@@ -9,12 +9,12 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "0hz323favjm0gz4s2112rl8ygw7dy2pz808yhraplq8nljqh4h11";
+    sha256 = "04cm8h7if8yvczcwd83drbfzgr1spfspzg5im8lb540ks9x55dz4";
   };
 
   srcStatic = fetchurl {
     url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-x64.tar.gz";
-    sha256 = "0vk668ibayx0hqlam9jns5c7pggdh83yy54hnz5l7fnws4lm50qc";
+    sha256 = "1p36hniay2y3mwg300b7n3sl3vv7l5jq5ddcnmpmznwyd8zwbl4h";
   };
 
   preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";
@@ -28,8 +28,8 @@ buildGoPackage rec {
   meta = with lib; {
     description = "Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB";
     license = licenses.asl20;
-    homepage = http://grafana.org/;
-    maintainers = with maintainers; [ offline fpletz ];
+    homepage = https://grafana.org/;
+    maintainers = with maintainers; [ offline fpletz willibutz ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix
index 20fb74924d3..8fe4b8df1ab 100644
--- a/pkgs/servers/sonarr/default.nix
+++ b/pkgs/servers/sonarr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "sonarr-${version}";
-  version = "2.0.0.4928";
+  version = "2.0.0.4949";
 
   src = fetchurl {
     url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz";
-    sha256 = "0wggh8z5dmkkcgbb1hzikia55djdqmbqz2dpzx1iyvgys7y5n8xm";
+    sha256 = "7e4e3a3668ee7485d0ee4009bcd1f2a7c3e8c25da7d9170272ef275a19c76ac4";
   };
 
   buildInputs = [
diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix
index 779256046e5..47d67f91ec7 100644
--- a/pkgs/tools/misc/file/default.nix
+++ b/pkgs/tools/misc/file/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "file-${version}";
-  version = "5.31";
+  version = "5.32";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.astron.com/pub/file/${name}.tar.gz"
       "https://distfiles.macports.org/file/${name}.tar.gz"
     ];
-    sha256 = "1vp4zihaxkhi85chkjgd4r4zdg4k2wa3c6pmajhbmx6gr7d8ii89";
+    sha256 = "0l1bfa0icng9vdwya00ff48fhvjazi5610ylbhl35qi13d6xqfc6";
   };
 
   buildInputs = [ zlib ];
diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix
index 4c3dfe4d07c..5b96e513fd4 100644
--- a/pkgs/tools/security/afl/default.nix
+++ b/pkgs/tools/security/afl/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, bash, callPackage, makeWrapper
-, clang, llvm, which, libcgroup }:
+, clang, llvm, which, libcgroup
+}:
 
 let
   afl-qemu = callPackage ./qemu.nix {};
@@ -7,6 +8,7 @@ let
     else if stdenv.system == "i686-linux" then "qemu-i386"
     else throw "afl: no support for ${stdenv.system}!";
 in
+
 stdenv.mkDerivation rec {
   name    = "afl-${version}";
   version = "2.48b";
@@ -23,7 +25,7 @@ stdenv.mkDerivation rec {
   buildPhase   = ''
     make PREFIX=$out
     cd llvm_mode
-    make PREFIX=$out CC=${clang}/bin/clang CXX=${clang}/bin/clang++
+    make PREFIX=$out
     cd ..
   '';
   installPhase = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e7fc809c5c2..9c0671ef80a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -394,7 +394,9 @@ with pkgs;
 
   afio = callPackage ../tools/archivers/afio { };
 
-  afl = callPackage ../tools/security/afl { };
+  afl = callPackage ../tools/security/afl {
+    stdenv = clangStdenv;
+  };
 
   afpfs-ng = callPackage ../tools/filesystems/afpfs-ng/default.nix { };
 
@@ -794,10 +796,10 @@ with pkgs;
     enableSharedExecutables = false;
     executableToolDepends = [ makeWrapper ];
     postInstall = ''
-      exe=$libexec/bin/${drv.pname}-${drv.version}/${drv.pname}
-      install -D $bin/bin/${drv.pname} $exe
-      rm -rf $bin/bin $out/lib $out/share
-      makeWrapper $exe $bin/bin/${drv.pname} \
+      exe=$out/libexec/${drv.pname}-${drv.version}/${drv.pname}
+      install -D $out/bin/${drv.pname} $exe
+      rm -rf $out/{bin,lib,share}
+      makeWrapper $exe $out/bin/${drv.pname} \
         --prefix PATH ":" "${nix}/bin" \
         --prefix PATH ":" "${nix-prefetch-scripts}/bin"
       mkdir -p $out/share/bash-completion/completions
@@ -809,7 +811,7 @@ with pkgs;
     executableToolDepends = [ makeWrapper ];
     postInstall = ''
       wrapProgram $out/bin/stack2nix \
-        ${lib.makeBinPath [ git cabal2nix cabal-install stack ]}
+        --prefix PATH ":" "${git}/bin:${cabal2nix}/bin:${cabal-install}/bin:${stack}/bin"
     '';
   });
 
@@ -5364,6 +5366,10 @@ with pkgs;
 
   gccApple = throw "gccApple is no longer supported";
 
+  libstdcxxHook = makeSetupHook
+    { substitutions = { gcc = gcc-unwrapped; }; }
+    ../development/compilers/gcc/libstdc++-hook.sh;
+
   # Can't just overrideCC, because then the stdenv-cross mkDerivation will be
   # thrown away. TODO: find a better solution for this.
   crossLibcStdenv = buildPackages.makeStdenvCross {
@@ -5697,7 +5703,11 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security Foundation;
   };
 
-  go = go_1_8;
+  go_1_9 = callPackage ../development/compilers/go/1.9.nix {
+    inherit (darwin.apple_sdk.frameworks) Security Foundation;
+  };
+
+  go = go_1_9;
 
   go-repo-root = callPackage ../development/tools/go-repo-root { };
 
@@ -10370,7 +10380,6 @@ with pkgs;
 
   shhopt = callPackage ../development/libraries/shhopt { };
 
-  silgraphite = callPackage ../development/libraries/silgraphite {};
   graphite2 = callPackage ../development/libraries/silgraphite/graphite2.nix {};
 
   simavr = callPackage ../development/tools/simavr { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7a62d8b95eb..2c811c05777 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -143,7 +143,9 @@ in {
 
   breathe = callPackage ../development/python-modules/breathe { };
 
-  browsermob-proxy = callPackage ../development/python-modules/browsermob-proxy {};
+  browsermob-proxy = if ! isPy3k then
+    callPackage ../development/python-modules/browsermob-proxy {}
+  else throw "browsermob-proxy is not supported for ${python.executable}";
 
   bugseverywhere = callPackage ../applications/version-management/bugseverywhere {};