Merge remote-tracking branch 'upstream/master' into mariadb-10.2origin/mariadb-10.2

30 files changed, 1475 insertions, 959 deletions

diff --git a/doc/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.md
index bf8bcd7e704a..629db289ab1d 100644
--- a/doc/languages-frameworks/haskell.md
+++ b/doc/languages-frameworks/haskell.md
@@ -581,8 +581,8 @@ nix-shell "<nixpkgs>" -A haskellPackages.bar.env
 Every Haskell package set takes a function called `overrides` that you can use
 to manipulate the package as much as you please. One useful application of this
 feature is to replace the default `mkDerivation` function with one that enables
-library profiling for all packages. To accomplish that, add configure the
-following snippet in your `~/.config/nixpkgs/config.nix` file:
+library profiling for all packages. To accomplish that add the following
+snippet to your `~/.config/nixpkgs/config.nix` file:
 ```nix
 {
   packageOverrides = super: let self = super.pkgs; in
diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index 8c1db9c039e7..5fd636ff7c59 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -11,12 +11,12 @@
 assert stdenv ? glibc;
 
 stdenv.mkDerivation rec {
-  version = "2.2.5";
+  version = "2.4.0";
   name = "darktable-${version}";
 
   src = fetchurl {
     url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
-    sha256 = "10gjzd4irxhladh4jyss9kgp627k8vgx2divipsb33pp6cms80z3";
+    sha256 = "0y0q7a7k09sbg05k5xl1lz8n2ak1v8yarfv222ksvmbrxs53hdwx";
   };
 
   buildInputs =
@@ -49,6 +49,6 @@ stdenv.mkDerivation rec {
     homepage = https://www.darktable.org;
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
-    maintainers = [ maintainers.goibhniu maintainers.rickynils maintainers.flosse ];
+    maintainers = with maintainers; [ goibhniu rickynils flosse mrVanDalo ];
   };
 }
diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index 8a460f890167..cf9230fa193e 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -29,7 +29,6 @@ stdenv.mkDerivation rec {
 
   makeFlags = [
     "PREFIX=$(out)"
-    "RSTTOMAN=${docutils}/bin/rst2man.py"
     "VERBOSE=1"
     "TPUT=${ncurses.out}/bin/tput"
     (optionalString synctexSupport "WITH_SYNCTEX=1")
diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
index 4ec83af91607..f308073f1f1e 100644
--- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
@@ -18,7 +18,6 @@ stdenv.mkDerivation rec {
   ];
 
   postPatch = ''
-    substituteInPlace Makefile --replace rst2man rst2man.py
     patchShebangs .
   '';
 
diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
index ba2b71138067..1208afa19630 100644
--- a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
@@ -14,12 +14,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "man" ];
 
-  buildInputs = [ docutils makeWrapper ];
-
-  # The install.sh script expects rst2man, but here it's named rst2man.py
-  patchPhase = ''
-    sed -i 's/rst2man/rst2man.py/g' install.sh
-  '';
+  nativeBuildInputs = [ docutils makeWrapper ];
 
   installPhase = ''
     prefix="$out" ./install.sh
diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix
index bed0ef358271..07ea2be7ad34 100644
--- a/pkgs/applications/version-management/git-and-tools/tig/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix
@@ -4,14 +4,14 @@
 
 stdenv.mkDerivation rec {
   pname = "tig";
-  version = "2.3.0";
+  version = "2.3.2";
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "jonas";
     repo = pname;
     rev = name;
-    sha256 = "04qw3fyamm1lka9vh7adrkr2mcnwcch9ya5sph51jx6d4jz1lih5";
+    sha256 = "14cdlrdxbl8vzqw86fm3wyaixh607z47shc4dwd6rd9vj05w0m97";
   };
 
   nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkgconfig ];
diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version
index 13f8adf56771..5922f3f30cf2 100755
--- a/pkgs/common-updater/scripts/update-source-version
+++ b/pkgs/common-updater/scripts/update-source-version
@@ -39,13 +39,13 @@ if [ "$oldVersion" = "$newVersion" ]; then
     exit 0
 fi
 
-# Escape dots, there should not be any other regex characters allowed in store path names
-oldVersion=$(echo "$oldVersion" | sed -re 's|\.|\\.|g')
+# Escape regex metacharacter that are allowed in store path names
+oldVersion=$(echo "$oldVersion" | sed -re 's|[.+]|\\&|g')
 
-if [ $(grep -c -E "^\s*(let\b)?\s*version\s+=\s+\"$oldVersion\"" "$nixFile") = 1 ]; then
+if [ $(grep -c -E "^\s*(let\b)?\s*version\s*=\s*\"$oldVersion\"" "$nixFile") = 1 ]; then
     pattern="/\bversion\b\s*=/ s|\"$oldVersion\"|\"$newVersion\"|"
-elif [ $(grep -c -E "^\s*(let\b)?\s*name\s+=\s+\"$drvName-$oldVersion\"" "$nixFile") = 1 ]; then
-    pattern="/\bname\b\s*=/ s|\"$drvName-$oldVersion\"|\"$drvName-$newVersion\"|"
+elif [ $(grep -c -E "^\s*(let\b)?\s*name\s*=\s*\"[^\"]+-$oldVersion\"" "$nixFile") = 1 ]; then
+    pattern="/\bname\b\s*=/ s|-$oldVersion\"|-$newVersion\"|"
 else
     die "Couldn't figure out where out where to patch in new version in '$attr'!"
 fi
@@ -74,7 +74,7 @@ fi
 if [ -z "$newHash" ]; then
     nix-build --no-out-link -A "$attr.src" 2>"$attr.fetchlog" >/dev/null || true
     # FIXME: use nix-build --hash here once https://github.com/NixOS/nix/issues/1172 is fixed
-    newHash=$(tail -n2 "$attr.fetchlog" | grep "output path .* has .* hash .* when .* was expected" | head -n1 | tr -dc '\040-\177' | awk '{ print $(NF-4) }')
+    newHash=$(egrep -v "killing process|dependencies couldn't be built" "$attr.fetchlog" | tail -n2 | grep "output path .* has .* hash .* when .* was expected" | head -n1 | tr -dc '\040-\177' | tr -d "'" | awk '{ print $(NF-4) }')
 fi
 
 if [ -z "$newHash" ]; then
@@ -82,6 +82,11 @@ if [ -z "$newHash" ]; then
     die "Couldn't figure out new hash of '$attr.src'!"
 fi
 
+if [ "$oldVersion" != "$newVersion" ] && [ "$oldHash" = "$newHash" ]; then
+    mv "$nixFile.bak" "$nixFile"
+    die "Both the old and new source hashes of '$attr.src' were equivalent. Please fix the package's source URL to be dependent on '\${version}'!"
+fi
+
 sed -i "$nixFile" -re "s|\"$tempHash\"|\"$newHash\"|"
 if cmp -s "$nixFile" "$nixFile.bak"; then
     die "Failed to replace temporary source hash of '$attr' to the final source hash!"
diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix
index 6ac5165b7e9e..3f25041f1753 100644
--- a/pkgs/development/compilers/cmdstan/default.nix
+++ b/pkgs/development/compilers/cmdstan/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python }:
 
 stdenv.mkDerivation rec {
-  name = "cmdstan-2.9.0";
+  name = "cmdstan-2.17.1";
 
   src = fetchurl {
-    url = "https://github.com/stan-dev/cmdstan/releases/download/v2.9.0/cmdstan-2.9.0.tar.gz";
-    sha256 = "08bim6nxgam989152hm0ga1rfb33mr71pwsym1nmfmavma68bwm9";
+    url = "https://github.com/stan-dev/cmdstan/releases/download/v2.17.1/cmdstan-2.17.1.tar.gz";
+    sha256 = "1vq1cnrkvrvbfl40j6ajc60jdrjcxag1fi6kff5pqmadfdz9564j";
   };
 
   buildFlags = "build";
@@ -37,6 +37,6 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://mc-stan.org/interfaces/cmdstan.html;
     license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/ghc/7.10.2.nix b/pkgs/development/compilers/ghc/7.10.2.nix
deleted file mode 100644
index 51274dd60598..000000000000
--- a/pkgs/development/compilers/ghc/7.10.2.nix
+++ /dev/null
@@ -1,88 +0,0 @@
-{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, ncurses, libiconv, targetPackages, coreutils
-, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, hscolour
-
-  # If enabled GHC will be build with the GPL-free but slower integer-simple
-  # library instead of the faster but GPLed integer-gmp library.
-, enableIntegerSimple ? false, gmp
-}:
-
-let
-  inherit (bootPkgs) ghc;
-
-  buildMK = ''
-    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
-    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib"
-    ${stdenv.lib.optionalString stdenv.isDarwin ''
-      libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include"
-      libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib"
-    ''}
-  '' + (if enableIntegerSimple then ''
-    INTEGER_LIBRARY=integer-simple
-  '' else ''
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib"
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include"
-  '');
-
-in
-
-stdenv.mkDerivation rec {
-  version = "7.10.2";
-  name = "ghc-${version}";
-
-  src = fetchurl {
-    url = "https://downloads.haskell.org/~ghc/7.10.2/${name}-src.tar.xz";
-    sha256 = "1x8m4rp2v7ydnrz6z9g8x7z3x3d3pxhv2pixy7i7hkbqbdsp7kal";
-  };
-
-  buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ];
-
-  patches = [ ./relocation.patch ];
-
-  enableParallelBuilding = true;
-
-  outputs = [ "out" "doc" ];
-
-  preConfigure = ''
-    echo >mk/build.mk "${buildMK}"
-    sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
-  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
-    export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
-    export NIX_LDFLAGS+=" -no_dtrace_dof"
-  '';
-
-  configureFlags = [
-    "--with-gcc=${stdenv.cc}/bin/cc"
-    "--datadir=$doc/share/doc/ghc"
-  ] ++ stdenv.lib.optional (! enableIntegerSimple) [
-    "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
-  ];
-
-  # required, because otherwise all symbols from HSffi.o are stripped, and
-  # that in turn causes GHCi to abort
-  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols";
-
-  postInstall = ''
-    # Install the bash completion file.
-    install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc
-
-    # Patch scripts to include "readelf" and "cat" in $PATH.
-    for i in "$out/bin/"*; do
-      test ! -h $i || continue
-      egrep --quiet '^#!' <(head -n 1 $i) || continue
-      sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
-    done
-  '';
-
-  passthru = {
-    inherit bootPkgs;
-  };
-
-  meta = {
-    homepage = http://haskell.org/ghc;
-    description = "The Glasgow Haskell Compiler";
-    maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
-    inherit (ghc.meta) license platforms;
-  };
-
-}
diff --git a/pkgs/development/compilers/jhc/default.nix b/pkgs/development/compilers/jhc/default.nix
deleted file mode 100644
index 6b8c6599062e..000000000000
--- a/pkgs/development/compilers/jhc/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, fetchurl, perl, ghcWithPackages }:
-
-let ghc = ghcWithPackages (hpkgs: with hpkgs; [
-            binary zlib utf8-string readline fgl regex-compat HsSyck random
-          ]);
-in
-
-stdenv.mkDerivation rec {
-  name = "jhc-${version}";
-  version = "0.8.2";
-
-  src = fetchurl {
-    url    = "http://repetae.net/dist/${name}.tar.gz";
-    sha256 = "0lrgg698mx6xlrqcylba9z4g1f053chrzc92ri881dmb1knf83bz";
-  };
-
-  buildInputs = [ perl ghc ];
-
-  preConfigure = ''
-    configureFlagsArray+=("CC=cc")
-    configureFlagsArray+=("--with-hsc2hs=${ghc}/bin/hsc2hs --cc=cc")
-  '';
-
-  meta = {
-    description = "Whole-program, globally optimizing Haskell compiler";
-    homepage = http://repetae.net/computer/jhc/;
-    license = stdenv.lib.licenses.bsd3;
-    platforms = ["x86_64-linux"]; # 32 bit builds are broken
-    maintainers = with stdenv.lib.maintainers; [ aforemny thoughtpolice ];
-    broken = true; # https://hydra.nixos.org/build/61700723
-  };
-}
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index a7bba91dcb6b..21168fa3537f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -905,13 +905,6 @@ self: super: {
   # https://github.com/takano-akio/filelock/issues/5
   filelock = dontCheck super.filelock;
 
-  # https://github.com/alpmestan/taggy/issues/{19,20}
-  taggy = appendPatch super.taggy (pkgs.fetchpatch {
-    name = "blaze-markup.patch";
-    url = "https://github.com/alpmestan/taggy/commit/5456c2fa4d377f7802ec5df3d5f50c4ccab2e8ed.patch";
-    sha256 = "1vss7b99zrhw3r29krl1b60r4qk0m2mpwmrz8q8zdxrh33hb8pd7";
-  });
-
   # cryptol-2.5.0 doesn't want happy 1.19.6+.
   cryptol = super.cryptol.override { happy = self.happy_1_19_5; };
 
@@ -958,9 +951,9 @@ self: super: {
   # Hoogle needs a newer version than lts-10 provides.
   hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_20_1; };
 
-  # These packages depend on each other, forming an infinte loop.
-  scalendar = markBroken super.scalendar;
-  SCalendar = markBroken super.SCalendar;
+  # These packages depend on each other, forming an infinite loop.
+  scalendar = null;
+  SCalendar = null;
 
   # Needs QuickCheck <2.10, which we don't have.
   edit-distance = doJailbreak super.edit-distance;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
deleted file mode 100644
index 47c8e7fa69ec..000000000000
--- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
+++ /dev/null
@@ -1,94 +0,0 @@
-{ pkgs, haskellLib }:
-
-with haskellLib;
-
-self: super: {
-
-  # LLVM is not supported on this GHC; use the latest one.
-  inherit (pkgs) llvmPackages;
-
-  # Disable GHC 6.12.x core libraries.
-  array = null;
-  base = null;
-  bin-package-db = null;
-  bytestring = null;
-  Cabal = null;
-  containers = null;
-  directory = null;
-  dph-base = null;
-  dph-par = null;
-  dph-prim-interface = null;
-  dph-prim-par = null;
-  dph-prim-seq = null;
-  dph-seq = null;
-  extensible-exceptions = null;
-  ffi = null;
-  filepath = null;
-  ghc-binary = null;
-  ghc-prim = null;
-  haskell98 = null;
-  hpc = null;
-  integer-gmp = null;
-  old-locale = null;
-  old-time = null;
-  pretty = null;
-  process = null;
-  random = null;
-  rts = null;
-  syb = null;
-  template-haskell = null;
-  time = null;
-  unix = null;
-
-  # These packages are core libraries in GHC 7.10.x, but not here.
-  binary = self.binary_0_8_5_1;
-  deepseq = self.deepseq_1_3_0_1;
-  haskeline = self.haskeline_0_7_3_1;
-  hoopl = self.hoopl_3_10_2_0;
-  terminfo = self.terminfo_0_4_0_2;
-  transformers = self.transformers_0_4_3_0;
-  xhtml = self.xhtml_3000_2_1;
-
-  # Requires ghc 8.2
-  ghc-proofs = dontDistribute super.ghc-proofs;
-
-  # We have no working cabal-install at the moment.
-  cabal-install = markBroken super.cabal-install;
-
-  # https://github.com/tibbe/hashable/issues/85
-  hashable = dontCheck super.hashable;
-
-  # Needs Cabal >= 1.18.x.
-  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_18_1_7; };
-
-  # Haddock chokes on the prologue from the cabal file.
-  ChasingBottoms = dontHaddock super.ChasingBottoms;
-
-  # https://github.com/glguy/utf8-string/issues/9
-  utf8-string = overrideCabal super.utf8-string (drv: {
-    configureFlags = drv.configureFlags or [] ++ ["-f-bytestring-in-base" "--ghc-option=-XUndecidableInstances"];
-    preConfigure = "sed -i -e 's|base >= .* < .*,|base,|' utf8-string.cabal";
-  });
-
-  # https://github.com/haskell/HTTP/issues/80
-  HTTP = doJailbreak super.HTTP;
-
-  # 6.12.3 doesn't support the latest version.
-  primitive = self.primitive_0_5_1_0;
-  parallel = self.parallel_3_2_0_3;
-  vector = self.vector_0_10_9_3;
-
-  # These packages need more recent versions of core libraries to compile.
-  happy = addBuildTools super.happy [self.Cabal_1_18_1_7 self.containers_0_4_2_1];
-  network-uri = addBuildTool super.network-uri self.Cabal_1_18_1_7;
-  stm = addBuildTool super.stm self.Cabal_1_18_1_7;
-  split = super.split_0_1_4_3;
-
-  # Needs hashable on pre 7.10.x compilers.
-  nats_1 = addBuildDepend super.nats_1 self.hashable;
-  nats = addBuildDepend super.nats self.hashable;
-
-  # Needs void on pre 7.10.x compilers.
-  conduit = addBuildDepend super.conduit self.void;
-
-}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
deleted file mode 100644
index 6bb96704cc20..000000000000
--- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
+++ /dev/null
@@ -1,85 +0,0 @@
-{ pkgs, haskellLib }:
-
-with haskellLib;
-
-self: super: {
-
-  # Suitable LLVM version.
-  llvmPackages = pkgs.llvmPackages_34;
-
-  # Disable GHC 7.0.x core libraries.
-  array = null;
-  base = null;
-  bin-package-db = null;
-  bytestring = null;
-  Cabal = null;
-  containers = null;
-  directory = null;
-  extensible-exceptions = null;
-  ffi = null;
-  filepath = null;
-  ghc-binary = null;
-  ghc-prim = null;
-  haskell2010 = null;
-  haskell98 = null;
-  hpc = null;
-  integer-gmp = null;
-  old-locale = null;
-  old-time = null;
-  pretty = null;
-  process = null;
-  random = null;
-  rts = null;
-  template-haskell = null;
-  time = null;
-  unix = null;
-
-  # These packages are core libraries in GHC 7.10.x, but not here.
-  binary = self.binary_0_7_6_1;
-  deepseq = self.deepseq_1_3_0_1;
-  haskeline = self.haskeline_0_7_3_1;
-  hoopl = self.hoopl_3_10_2_0;
-  terminfo = self.terminfo_0_4_0_2;
-  transformers = self.transformers_0_4_3_0;
-  xhtml = self.xhtml_3000_2_1;
-
-  # Requires ghc 8.2
-  ghc-proofs = dontDistribute super.ghc-proofs;
-
-  # https://github.com/tibbe/hashable/issues/85
-  hashable = dontCheck super.hashable;
-
-  # https://github.com/peti/jailbreak-cabal/issues/9
-  jailbreak-cabal = super.jailbreak-cabal.override {
-    Cabal = self.Cabal_1_20_0_4.override { deepseq = self.deepseq_1_3_0_1; };
-  };
-
-  # Haddock chokes on the prologue from the cabal file.
-  ChasingBottoms = dontHaddock super.ChasingBottoms;
-
-  # https://github.com/haskell/containers/issues/134
-  containers_0_4_2_1 = doJailbreak super.containers_0_4_2_1;
-
-  # These packages need more recent versions of core libraries to compile.
-  happy = addBuildTools super.happy [self.containers_0_4_2_1 self.deepseq_1_3_0_1];
-
-  # Setup: Can't find transitive deps for haddock
-  doctest = dontHaddock super.doctest;
-  hsdns = dontHaddock super.hsdns;
-
-  # Newer versions require bytestring >=0.10.
-  tar = super.tar_0_4_1_0;
-
-  # These builds need additional dependencies on old compilers.
-  nats_1 = addBuildDepend super.nats_1 self.hashable;
-  nats = addBuildDepend super.nats self.hashable;
-  conduit = addBuildDepend super.conduit self.void;
-  reflection = addBuildDepend super.reflection self.tagged;
-  semigroups = addBuildDepend super.semigroups self.nats;
-  text = addBuildDepend super.text self.bytestring-builder;
-
-  # Newer versions don't compile any longer.
-  network_2_6_3_1 = dontCheck super.network_2_6_3_1;
-  network = self.network_2_6_3_1;
-
-}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
deleted file mode 100644
index de47086409be..000000000000
--- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
+++ /dev/null
@@ -1,89 +0,0 @@
-{ pkgs, haskellLib }:
-
-with haskellLib;
-
-self: super: {
-
-  # Suitable LLVM version.
-  llvmPackages = pkgs.llvmPackages_34;
-
-  # Disable GHC 7.2.x core libraries.
-  array = null;
-  base = null;
-  binary = null;
-  bin-package-db = null;
-  bytestring = null;
-  Cabal = null;
-  containers = null;
-  directory = null;
-  extensible-exceptions = null;
-  ffi = null;
-  filepath = null;
-  ghc-prim = null;
-  haskell2010 = null;
-  haskell98 = null;
-  hoopl = null;
-  hpc = null;
-  integer-gmp = null;
-  old-locale = null;
-  old-time = null;
-  pretty = null;
-  process = null;
-  rts = null;
-  template-haskell = null;
-  time = null;
-  unix = null;
-
-  # These packages are core libraries in GHC 7.10.x, but not here.
-  deepseq = self.deepseq_1_3_0_1;
-  haskeline = self.haskeline_0_7_3_1;
-  terminfo = self.terminfo_0_4_0_2;
-  transformers = self.transformers_0_4_3_0;
-  xhtml = self.xhtml_3000_2_1;
-
-  # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_8_5_1; process = self.process_1_2_3_0; };
-
-  # Requires ghc 8.2
-  ghc-proofs = dontDistribute super.ghc-proofs;
-
-  # https://github.com/tibbe/hashable/issues/85
-  hashable = dontCheck super.hashable;
-
-  # https://github.com/peti/jailbreak-cabal/issues/9
-  jailbreak-cabal = super.jailbreak-cabal.override {
-    Cabal = self.Cabal_1_20_0_4.override { deepseq = self.deepseq_1_3_0_1; };
-  };
-
-  # Haddock chokes on the prologue from the cabal file.
-  ChasingBottoms = dontHaddock super.ChasingBottoms;
-
-  # The old containers version won't compile against newer versions of deepseq.
-  containers_0_4_2_1 = super.containers_0_4_2_1.override { deepseq = self.deepseq_1_3_0_1; };
-
-  # These packages need more recent versions of core libraries to compile.
-  happy = addBuildTools super.happy [self.containers_0_4_2_1 self.deepseq_1_3_0_1];
-
-  # Setup: Can't find transitive deps for haddock
-  doctest = dontHaddock super.doctest;
-  hsdns = dontHaddock super.hsdns;
-
-  # Needs hashable on pre 7.10.x compilers.
-  nats_1 = addBuildDepend super.nats_1 self.hashable;
-  nats = addBuildDepend super.nats self.hashable;
-
-  # Newer versions require bytestring >=0.10.
-  tar = super.tar_0_4_1_0;
-
-  # These builds need additional dependencies on old compilers.
-  conduit = addBuildDepend super.conduit self.void;
-  reflection = addBuildDepend super.reflection self.tagged;
-  semigroups = addBuildDepend super.semigroups self.nats;
-  optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups;
-  text = addBuildDepend super.text self.bytestring-builder;
-
-  # Newer versions don't compile any longer.
-  network_2_6_3_1 = dontCheck super.network_2_6_3_1;
-  network = self.network_2_6_3_1;
-
-}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
deleted file mode 100644
index 73bc28b4dd34..000000000000
--- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
+++ /dev/null
@@ -1,117 +0,0 @@
-{ pkgs, haskellLib }:
-
-with haskellLib;
-
-self: super: {
-
-  # Suitable LLVM version.
-  llvmPackages = pkgs.llvmPackages_34;
-
-  # Disable GHC 7.4.x core libraries.
-  array = null;
-  base = null;
-  binary = null;
-  bin-package-db = null;
-  bytestring = null;
-  Cabal = null;
-  containers = null;
-  deepseq = null;
-  directory = null;
-  extensible-exceptions = null;
-  filepath = null;
-  ghc-prim = null;
-  haskell2010 = null;
-  haskell98 = null;
-  hoopl = null;
-  hpc = null;
-  integer-gmp = null;
-  old-locale = null;
-  old-time = null;
-  pretty = null;
-  process = null;
-  rts = null;
-  template-haskell = null;
-  time = null;
-  unix = null;
-
-  # These packages are core libraries in GHC 7.10.x, but not here.
-  haskeline = self.haskeline_0_7_3_1;
-  terminfo = self.terminfo_0_4_0_2;
-  transformers = self.transformers_0_4_3_0;
-  xhtml = self.xhtml_3000_2_1;
-
-  # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_5_1; };
-
-  # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'.
-  cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_5_1; });
-
-  # Requires ghc 8.2
-  ghc-proofs = dontDistribute super.ghc-proofs;
-
-  # https://github.com/tibbe/hashable/issues/85
-  hashable = dontCheck super.hashable;
-
-  # https://github.com/peti/jailbreak-cabal/issues/9
-  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_20_0_4; };
-
-  # Haddock chokes on the prologue from the cabal file.
-  ChasingBottoms = dontHaddock super.ChasingBottoms;
-
-  # https://github.com/haskell/primitive/issues/16
-  primitive = dontCheck super.primitive;
-
-  # https://github.com/tibbe/unordered-containers/issues/96
-  unordered-containers = dontCheck super.unordered-containers;
-
-  # The test suite depends on time >=1.4.0.2.
-  cookie = dontCheck super.cookie ;
-
-  # Work around bytestring >=0.10.2.0 requirement.
-  streaming-commons = addBuildDepend super.streaming-commons self.bytestring-builder;
-
-  # Choose appropriate flags for our version of 'bytestring'.
-  bytestring-builder = disableCabalFlag super.bytestring-builder "bytestring_has_builder";
-
-  # Newer versions require a more recent compiler.
-  control-monad-free = super.control-monad-free_0_5_3;
-
-  # Needs hashable on pre 7.10.x compilers.
-  nats_1 = addBuildDepend super.nats_1 self.hashable;
-  nats = addBuildDepend super.nats self.hashable;
-
-  # Test suite won't compile.
-  unix-time = dontCheck super.unix-time;
-
-  # The test suite depends on mockery, which pulls in logging-facade, which
-  # doesn't compile with this older version of base:
-  # https://github.com/sol/logging-facade/issues/14
-  doctest = dontCheck super.doctest;
-
-  # Avoid depending on tasty-golden.
-  monad-par = dontCheck super.monad-par;
-
-  # Newer versions require bytestring >=0.10.
-  tar = super.tar_0_4_1_0;
-
-  # Needs void on pre 7.10.x compilers.
-  conduit = addBuildDepend super.conduit self.void;
-
-  # Needs tagged on pre 7.6.x compilers.
-  reflection = addBuildDepend super.reflection self.tagged;
-
-  # These builds need additional dependencies on old compilers.
-  semigroups = addBuildDepends super.semigroups (with self; [nats bytestring-builder tagged unordered-containers transformers]);
-  QuickCheck = addBuildDepends super.QuickCheck (with self; [nats semigroups]);
-  optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups;
-  text = addBuildDepend super.text self.bytestring-builder;
-  vector = addBuildDepend super.vector self.semigroups;
-
-  # Newer versions don't compile any longer.
-  network_2_6_3_1 = dontCheck super.network_2_6_3_1;
-  network = self.network_2_6_3_1;
-
-  # Haddock fails with an internal error.
-  utf8-string = dontHaddock super.utf8-string;
-
-}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
deleted file mode 100644
index 43a1b1b70bd1..000000000000
--- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+++ /dev/null
@@ -1,124 +0,0 @@
-{ pkgs, haskellLib }:
-
-with haskellLib;
-
-self: super: {
-
-  # Suitable LLVM version.
-  llvmPackages = pkgs.llvmPackages_34;
-
-  # Disable GHC 7.6.x core libraries.
-  array = null;
-  base = null;
-  binary = null;
-  bin-package-db = null;
-  bytestring = null;
-  Cabal = null;
-  containers = null;
-  deepseq = null;
-  directory = null;
-  filepath = null;
-  ghc-prim = null;
-  haskell2010 = null;
-  haskell98 = null;
-  hoopl = null;
-  hpc = null;
-  integer-gmp = null;
-  old-locale = null;
-  old-time = null;
-  pretty = null;
-  process = null;
-  rts = null;
-  template-haskell = null;
-  time = null;
-  unix = null;
-
-  # These packages are core libraries in GHC 7.10.x, but not here.
-  haskeline = self.haskeline_0_7_3_1;
-  terminfo = self.terminfo_0_4_0_2;
-  transformers = self.transformers_0_4_3_0;
-  xhtml = self.xhtml_3000_2_1;
-
-  # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'.
-  cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_5_1; });
-
-  # Requires ghc 8.2
-  ghc-proofs = dontDistribute super.ghc-proofs;
-
-  # https://github.com/tibbe/hashable/issues/85
-  hashable = dontCheck super.hashable;
-
-  # https://github.com/peti/jailbreak-cabal/issues/9
-  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_20_0_4; };
-
-  # Haddock chokes on the prologue from the cabal file.
-  ChasingBottoms = dontHaddock super.ChasingBottoms;
-
-  # Later versions require a newer version of bytestring than we have.
-  aeson = self.aeson_0_7_0_6;
-
-  # The test suite depends on time >=1.4.0.2.
-  cookie = dontCheck super.cookie;
-
-  # Work around bytestring >=0.10.2.0 requirement.
-  streaming-commons = addBuildDepend super.streaming-commons self.bytestring-builder;
-
-  # Choose appropriate flags for our version of 'bytestring'.
-  bytestring-builder = disableCabalFlag super.bytestring-builder "bytestring_has_builder";
-
-  # Tagged is not part of base in this environment.
-  contravariant = addBuildDepend super.contravariant self.tagged;
-  reflection = dontHaddock (addBuildDepend super.reflection self.tagged);
-
-  # The compat library is empty in the presence of mtl 2.2.x.
-  mtl-compat = dontHaddock super.mtl-compat;
-
-  # Newer versions require a more recent compiler.
-  control-monad-free = super.control-monad-free_0_5_3;
-
-  # Needs hashable on pre 7.10.x compilers.
-  nats_1 = addBuildDepend super.nats_1 self.hashable;
-  nats = addBuildDepend super.nats self.hashable;
-
-  # https://github.com/magthe/sandi/issues/7
-  sandi = overrideCabal super.sandi (drv: {
-    postPatch = "sed -i -e 's|base ==4.8.*,|base,|' sandi.cabal";
-  });
-
-  # These packages require additional build inputs on older compilers.
-  blaze-builder = addBuildDepend super.blaze-builder super.bytestring-builder;
-  text = addBuildDepend super.text self.bytestring-builder;
-
-  # available convertible package won't build with the available
-  # bytestring and ghc-mod won't build without convertible
-  convertible = markBroken super.convertible;
-  ghc-mod = markBroken super.ghc-mod;
-
-  # Needs void on pre 7.10.x compilers.
-  conduit = addBuildDepend super.conduit self.void;
-
-  # Needs additional inputs on old compilers.
-  semigroups = addBuildDepends super.semigroups (with self; [bytestring-builder nats tagged unordered-containers transformers]);
-  lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]);
-  distributive = addBuildDepend (dontCheck super.distributive) self.semigroups;
-  QuickCheck = addBuildDepend super.QuickCheck self.semigroups;
-  void = addBuildDepends super.void (with self; [hashable semigroups]);
-  optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups;
-  vector = addBuildDepend super.vector self.semigroups;
-
-  # Need a newer version of Cabal to interpret their build instructions.
-  cmdargs = addSetupDepend super.cmdargs self.Cabal_1_24_2_0;
-  extra = addSetupDepend super.extra self.Cabal_1_24_2_0;
-  hlint = addSetupDepend super.hlint self.Cabal_1_24_2_0;
-
-  # Haddock doesn't cope with the new markup.
-  bifunctors = dontHaddock super.bifunctors;
-
-  # Breaks a dependency cycle between QuickCheck and semigroups
-  unordered-containers = dontCheck super.unordered-containers;
-
-  # The test suite requires Cabal 1.24.x or later to compile.
-  comonad = dontCheck super.comonad;
-  semigroupoids = dontCheck super.semigroupoids;
-
-}
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index c5bb3145fa45..60dc80a159b0 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -8461,13 +8461,11 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "HSlippyMap";
-       version = "2.2";
-       sha256 = "17n1kpva97lwhwg2vs7875bfqlwcq6xpl2agqc53qb7j4153p559";
-       revision = "2";
-       editedCabalFile = "0iw3s7snb255jxj555vyfl3ckgqxf6xivbzl4z9ypy18a5glpzri";
+       version = "2.5";
+       sha256 = "10n69p8ka1ri54in7yh1gjwh7fcw8nx4rvfhs9gcxmvawj96fyab";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/41px/HSlippyMap";
-       description = "OpenStreetMap (OSM) Slippy Map";
+       homepage = "https://github.com/apeyroux/HSlippyMap";
+       description = "OpenStreetMap Slippy Map";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -13692,6 +13690,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) mesa;};
 
+  "OpenGLRaw_3_2_7_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, fixed, half, mesa
+     , text, transformers
+     }:
+     mkDerivation {
+       pname = "OpenGLRaw";
+       version = "3.2.7.0";
+       sha256 = "024aln102d1mmsdalq9jd5mmwjbnrb8gxcak73lybrc7q87kswk2";
+       libraryHaskellDepends = [
+         base bytestring containers fixed half text transformers
+       ];
+       librarySystemDepends = [ mesa ];
+       homepage = "http://www.haskell.org/haskellwiki/Opengl";
+       description = "A raw binding for the OpenGL graphics system";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) mesa;};
+
   "OpenGLRaw21" = callPackage
     ({ mkDerivation, OpenGLRaw }:
      mkDerivation {
@@ -15574,7 +15590,7 @@ self: {
        sha256 = "139lggc8f7sw703asdyxqbja0jfcgphx0l5si1046lsryinvywa9";
        libraryHaskellDepends = [ base containers text time ];
        testHaskellDepends = [
-         base containers hspec QuickCheck text time
+         base containers hspec QuickCheck scalendar text time
        ];
        homepage = "https://www.researchgate.net/publication/311582722_Method_of_Managing_Resources_in_a_Telecommunication_Network_or_a_Computing_System";
        description = "This is a library for handling calendars and resource availability based on the \"top-nodes algorithm\" and set operations";
@@ -21630,6 +21646,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "aeson-generic-compat_0_0_1_1" = callPackage
+    ({ mkDerivation, aeson, base }:
+     mkDerivation {
+       pname = "aeson-generic-compat";
+       version = "0.0.1.1";
+       sha256 = "1davhg48x4k9nsizpafjlicwryi05ijfh902bn35x76pay7alims";
+       libraryHaskellDepends = [ aeson base ];
+       description = "Compatible generic class names of Aeson";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "aeson-injector" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, containers, deepseq
      , hashable, HUnit, lens, QuickCheck, quickcheck-text, scientific
@@ -22018,18 +22046,18 @@ self: {
      }) {};
 
   "affection" = callPackage
-    ({ mkDerivation, babl, base, clock, containers, gegl, glib
-     , monad-loops, monad-parallel, mtl, sdl2, text
+    ({ mkDerivation, base, bytestring, clock, containers, glib, linear
+     , monad-loops, monad-parallel, mtl, OpenGL, sdl2, stm, text, uuid
      }:
      mkDerivation {
        pname = "affection";
-       version = "0.0.0.6";
-       sha256 = "0fc071zl68acm01ik4v1admy0hs4jp787kpadw9ddavwykmr6jdz";
+       version = "0.0.0.7";
+       sha256 = "0qnlh1ny4cysxzh45vsh1d49gk4kc2kzpdjrqnn3mh66wz2fc177";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         babl base clock containers gegl glib monad-loops monad-parallel mtl
-         sdl2 text
+         base bytestring clock containers glib linear monad-loops
+         monad-parallel mtl OpenGL sdl2 stm text uuid
        ];
        homepage = "https://github.com/nek0/affection#readme";
        description = "A simple Game Engine using SDL";
@@ -22821,8 +22849,8 @@ self: {
      }:
      mkDerivation {
        pname = "algebra";
-       version = "4.3";
-       sha256 = "1h61lvy9fkkzm2gpr78b09bid0yi1fd7xa4mx90jy2sd16gq6k1r";
+       version = "4.3.1";
+       sha256 = "090jaipyx5pcav2wqcqzds51fwx49l4c9cpp9nnk16bgkf92z615";
        libraryHaskellDepends = [
          adjunctions array base containers distributive mtl nats
          semigroupoids semigroups tagged transformers void
@@ -23354,6 +23382,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "alternators_0_1_2_0" = callPackage
+    ({ mkDerivation, base, mmorph, transformers }:
+     mkDerivation {
+       pname = "alternators";
+       version = "0.1.2.0";
+       sha256 = "19i2yhi6nsd2nl7sisbj6wrii5nw1z7xj7zk0fjmivyclnj03r5g";
+       libraryHaskellDepends = [ base mmorph transformers ];
+       homepage = "https://github.com/louispan/alternators#readme";
+       description = "Handy functions when using transformers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "altfloat" = callPackage
     ({ mkDerivation, base, ghc-prim, integer-gmp }:
      mkDerivation {
@@ -26046,6 +26087,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ansi-terminal_0_8" = callPackage
+    ({ mkDerivation, base, colour }:
+     mkDerivation {
+       pname = "ansi-terminal";
+       version = "0.8";
+       sha256 = "1gg2xy800vzj2xixx8ifis1z027v34xj1a3792v0y8b7kmypgwlb";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base colour ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/feuerbach/ansi-terminal";
+       description = "Simple ANSI terminal support, with Windows compatibility";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ansi-wl-pprint" = callPackage
     ({ mkDerivation, ansi-terminal, base }:
      mkDerivation {
@@ -29022,28 +29079,32 @@ self: {
 
   "ats-format" = callPackage
     ({ mkDerivation, alex, ansi-terminal, ansi-wl-pprint, array, base
-     , bytestring, Cabal, composition-prelude, criterion, deepseq
-     , directory, file-embed, happy, hspec, htoml-megaparsec, lens
-     , megaparsec, optparse-applicative, process, recursion-schemes
-     , text, unordered-containers
+     , Cabal, composition-prelude, criterion, deepseq, directory
+     , dirstream, file-embed, filepath, happy, hspec, hspec-core
+     , htoml-megaparsec, lens, megaparsec, optparse-applicative, pipes
+     , pipes-safe, process, recursion-schemes, system-filepath, text
+     , unordered-containers
      }:
      mkDerivation {
        pname = "ats-format";
-       version = "0.1.0.3";
-       sha256 = "0pisqcx11n2xrdr5xq1y08fbx0hhnvhqngf2bh1wqpfr1ad4vj76";
+       version = "0.1.0.6";
+       sha256 = "04r12ssp9ih4rrynlab2swn7krklzrb5m1xz0xh99adhfvap4fmf";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal directory lens process ];
        libraryHaskellDepends = [
-         ansi-terminal ansi-wl-pprint array base bytestring
-         composition-prelude deepseq directory file-embed htoml-megaparsec
-         lens megaparsec optparse-applicative process recursion-schemes text
+         ansi-terminal ansi-wl-pprint array base composition-prelude deepseq
+         directory file-embed htoml-megaparsec lens megaparsec
+         optparse-applicative process recursion-schemes text
          unordered-containers
        ];
        libraryToolDepends = [ alex happy ];
        executableHaskellDepends = [ base ];
-       testHaskellDepends = [ base hspec ];
+       testHaskellDepends = [
+         base dirstream filepath hspec hspec-core pipes pipes-safe
+         system-filepath
+       ];
        benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://hub.darcs.net/vmchale/ats-format#readme";
        description = "A source-code formatter for ATS";
@@ -29707,6 +29768,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "autoexporter_1_1_3" = callPackage
+    ({ mkDerivation, base, Cabal, directory, filepath }:
+     mkDerivation {
+       pname = "autoexporter";
+       version = "1.1.3";
+       sha256 = "0rkgb2vfznn6a28h40c26if43mzcavwd81myi27zbg8811g9bv6m";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base Cabal directory filepath ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/tfausak/autoexporter#readme";
+       description = "Automatically re-export modules";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "autom" = callPackage
     ({ mkDerivation, base, bytestring, colour, ghc-prim, gloss
      , JuicyPixels, random, vector
@@ -35013,6 +35090,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "bittrex" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, http-client-tls, lens
+     , lens-aeson, scientific, SHA, split, text, time, wreq
+     }:
+     mkDerivation {
+       pname = "bittrex";
+       version = "0.3.0.0";
+       sha256 = "00h2lrs2a65f2fc4wkmlil3hqwlnayxxvb7nq2gcmkcpgsf9sc1k";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring http-client-tls lens lens-aeson scientific
+         SHA split text time wreq
+       ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/dmjio/bittrex";
+       description = "API bindings to bittrex.com";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "bitvec" = callPackage
     ({ mkDerivation, base, HUnit, primitive, QuickCheck, test-framework
      , test-framework-hunit, test-framework-quickcheck2, vector
@@ -35072,6 +35169,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bitx-bitcoin_0_12_0_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, deepseq, directory
+     , doctest, exceptions, hspec, http-client, http-client-tls
+     , http-types, microlens, microlens-th, network, QuickCheck, safe
+     , scientific, split, text, time
+     }:
+     mkDerivation {
+       pname = "bitx-bitcoin";
+       version = "0.12.0.0";
+       sha256 = "0wf86pkpm5vlcv5cci2sn6by0ajmq44b3azxc41zivqdpf5kkwii";
+       libraryHaskellDepends = [
+         aeson base bytestring deepseq exceptions http-client
+         http-client-tls http-types microlens microlens-th network
+         QuickCheck scientific split text time
+       ];
+       testHaskellDepends = [
+         aeson base bytestring directory doctest hspec http-client
+         http-types microlens safe text time
+       ];
+       homepage = "https://github.com/tebello-thejane/bitx.hs";
+       description = "A Haskell library for working with the BitX bitcoin exchange";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bizzlelude" = callPackage
     ({ mkDerivation, base, containers, directory, text }:
      mkDerivation {
@@ -38725,19 +38847,21 @@ self: {
      }) {};
 
   "cabal-bounds" = callPackage
-    ({ mkDerivation, base, Cabal, cabal-lenses, cmdargs, directory
-     , either, filepath, Glob, lens, process, strict, tasty
-     , tasty-golden, transformers, unordered-containers
+    ({ mkDerivation, aeson, base, bytestring, Cabal, cabal-lenses
+     , cmdargs, directory, either, filepath, Glob, lens, lens-aeson
+     , process, strict, tasty, tasty-golden, text, transformers
+     , unordered-containers
      }:
      mkDerivation {
        pname = "cabal-bounds";
-       version = "1.2.0";
-       sha256 = "1lbkfz5sw292br1zcki2r3qpzc1q5hk3h40xkbbhflqmw3m1h0fj";
+       version = "1.3.0";
+       sha256 = "0cv4j4x5zwnddi6nsnl78i1b1pisg6fwpdpy2iv8ndyw3h2msmys";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base Cabal cabal-lenses cmdargs directory either filepath lens
-         strict transformers unordered-containers
+         aeson base bytestring Cabal cabal-lenses cmdargs directory either
+         filepath lens lens-aeson strict text transformers
+         unordered-containers
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
@@ -38755,8 +38879,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-cargs";
-       version = "0.8.1";
-       sha256 = "0xzzxzh41k8h6sf04b6j49b44c68gvghh0slifywj171ip4zv5g3";
+       version = "0.9.0";
+       sha256 = "0w371991841m4d9r73nr86j4jnr0jilj9jnvkmgh9a055vyi573s";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -39138,8 +39262,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-lenses";
-       version = "0.4.9";
-       sha256 = "0f4250cssh42xvrr6npnv71303pxkhv3k26bh6j2ifwz489nmfsr";
+       version = "0.6.0";
+       sha256 = "0wj6plxg19mfaycw6glrn7b5g2rsvvflkar63qn01c86vzkj7ynd";
        libraryHaskellDepends = [
          base Cabal either lens strict system-fileio system-filepath text
          transformers unordered-containers
@@ -39472,6 +39596,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cabal-toolkit_0_0_4" = callPackage
+    ({ mkDerivation, base, binary, bytestring, Cabal, containers, ghc
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "cabal-toolkit";
+       version = "0.0.4";
+       sha256 = "04afwsbbqsw9lj7flbnrfwy3qbv1c9nkwm65ylspy2nzf9v06ljj";
+       libraryHaskellDepends = [
+         base binary bytestring Cabal containers ghc template-haskell
+       ];
+       homepage = "https://github.com/TerrorJack/cabal-toolkit#readme";
+       description = "Helper functions for writing custom Setup.hs scripts.";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cabal-uninstall" = callPackage
     ({ mkDerivation, base, directory, filepath, mtl, process }:
      mkDerivation {
@@ -41755,8 +41896,8 @@ self: {
      }:
      mkDerivation {
        pname = "celtchar";
-       version = "0.1.2.0";
-       sha256 = "1p53fyv15vvch6zjv2mgycj9wpcxkxpfbwkmbi7dpjgi65wyaz97";
+       version = "0.1.3.0";
+       sha256 = "1f67vi6kjjhnnr4kxnzgkva1qvcadx9968cmac3iix2g56xs26wn";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -45504,8 +45645,8 @@ self: {
     ({ mkDerivation, array, base, bytestring, file-embed, text }:
      mkDerivation {
        pname = "cndict";
-       version = "0.9.0";
-       sha256 = "0v0drr7zxh2ndq91vhpsi4ykna993fnkfmxana7g1q4c2vn8b5sc";
+       version = "0.10.0";
+       sha256 = "12vybpji4bxwn8in18xqp4l2js1cbnn8fgk3r6m5c8idp769ph2m";
        libraryHaskellDepends = [ array base bytestring file-embed text ];
        homepage = "https://github.com/Lemmih/cndict";
        description = "Chinese/Mandarin <-> English dictionary, Chinese lexer";
@@ -45974,8 +46115,8 @@ self: {
      }:
      mkDerivation {
        pname = "collection-json";
-       version = "1.1.0.2";
-       sha256 = "033hwm20w1432nh3gvphkkyl9i4rjm74l3szplpsq0a9rp097la0";
+       version = "1.1.1.0";
+       sha256 = "1fvgwshw4622p7j2fnvpxq3bj3pgcshrbrik74a3sdgdj01kpl6c";
        libraryHaskellDepends = [
          aeson base network-uri network-uri-json text
        ];
@@ -47241,8 +47382,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "composition-prelude";
-       version = "0.1.1.1";
-       sha256 = "124r75vmbjd6nvibj3yadwnrkhr1r2d6i30qx3acidljw0fjfcnm";
+       version = "0.1.1.2";
+       sha256 = "1ii230d9v7mcpsax9x001ai0nw6pm50zsgyaw9d1s9s2pvf927wr";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/vmchale/composition-prelude#readme";
        description = "Higher-order function combinators";
@@ -47678,6 +47819,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "concurrency_1_3_0_0" = callPackage
+    ({ mkDerivation, array, atomic-primops, base, exceptions
+     , monad-control, mtl, stm, transformers
+     }:
+     mkDerivation {
+       pname = "concurrency";
+       version = "1.3.0.0";
+       sha256 = "1z75m5wgvdp4lx6v18ap60pdqgdhf1132qlamm07m4dlpkd5il98";
+       libraryHaskellDepends = [
+         array atomic-primops base exceptions monad-control mtl stm
+         transformers
+       ];
+       homepage = "https://github.com/barrucadu/dejafu";
+       description = "Typeclasses, functions, and data types for concurrency and STM";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "concurrent-barrier" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -48196,6 +48355,38 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "conduit-extra_1_2_3" = 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, typed-process, unliftio-core
+     }:
+     mkDerivation {
+       pname = "conduit-extra";
+       version = "1.2.3";
+       sha256 = "1ca18kjfcbbcd345rxhpvdhnc0gma6408vpl0hasspb6k7yjsabk";
+       libraryHaskellDepends = [
+         async attoparsec base blaze-builder bytestring conduit directory
+         exceptions filepath monad-control network primitive process
+         resourcet stm streaming-commons text transformers transformers-base
+         typed-process unliftio-core
+       ];
+       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
@@ -48344,6 +48535,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "conduit-throttle_0_3_1_0" = callPackage
+    ({ mkDerivation, async, base, conduit, conduit-combinators
+     , conduit-extra, HUnit, monad-control, resourcet, stm, stm-chans
+     , stm-conduit, test-framework, test-framework-hunit
+     , throttle-io-stream, unliftio, unliftio-core
+     }:
+     mkDerivation {
+       pname = "conduit-throttle";
+       version = "0.3.1.0";
+       sha256 = "0ad3balm1r5jm4jvf26pr1kaiqnzvjznjh5kidk2bknxylbddmld";
+       libraryHaskellDepends = [
+         async base conduit conduit-combinators conduit-extra monad-control
+         resourcet stm stm-chans throttle-io-stream unliftio unliftio-core
+       ];
+       testHaskellDepends = [
+         async base conduit conduit-combinators conduit-extra HUnit
+         monad-control 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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "conduit-tokenize-attoparsec" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, conduit, hspec
      , resourcet, text
@@ -54321,6 +54537,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "data-diverse_2_0_1_0" = callPackage
+    ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim
+     , hspec, tagged
+     }:
+     mkDerivation {
+       pname = "data-diverse";
+       version = "2.0.1.0";
+       sha256 = "0997mn0amfl4k70rvrxjw24dzyr6sv42nr1d24whyy114lsiv05b";
+       libraryHaskellDepends = [
+         base containers deepseq ghc-prim tagged
+       ];
+       testHaskellDepends = [ base hspec tagged ];
+       benchmarkHaskellDepends = [ base criterion ];
+       homepage = "https://github.com/louispan/data-diverse#readme";
+       description = "Extensible records and polymorphic variants";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "data-diverse-lens" = callPackage
     ({ mkDerivation, base, data-diverse, generic-lens, hspec, lens
      , profunctors, tagged
@@ -54340,6 +54575,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "data-diverse-lens_2_1_0_0" = callPackage
+    ({ mkDerivation, base, data-diverse, generic-lens, hspec, lens
+     , profunctors, tagged
+     }:
+     mkDerivation {
+       pname = "data-diverse-lens";
+       version = "2.1.0.0";
+       sha256 = "1i71f67agjaflb1cz8v6qpfy1qfwwmw8fjq8zl6kqd28z4k0mms7";
+       libraryHaskellDepends = [
+         base data-diverse generic-lens lens profunctors tagged
+       ];
+       testHaskellDepends = [
+         base data-diverse generic-lens hspec lens tagged
+       ];
+       homepage = "https://github.com/louispan/data-diverse-lens#readme";
+       description = "Isos & Lens for Data.Diverse.Many and Prisms for Data.Diverse.Which";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "data-dword" = callPackage
     ({ mkDerivation, base, data-bword, ghc-prim, hashable, tasty
      , tasty-quickcheck, template-haskell
@@ -55487,19 +55742,28 @@ self: {
 
   "datadog" = callPackage
     ({ mkDerivation, aeson, auto-update, base, buffer-builder
-     , bytestring, lens, lifted-base, monad-control, network, old-locale
-     , text, time, transformers-base
+     , bytestring, Cabal, dlist, exceptions, hspec, http-client
+     , http-client-tls, http-types, lens, lifted-base, monad-control
+     , network, old-locale, random, text, time, transformers-base
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "datadog";
-       version = "0.1.0.1";
-       sha256 = "05hfpkaizbgqi998wa0l0hb8qph8y7gwyx05690ljr0883m5a663";
+       version = "0.2.0.0";
+       sha256 = "0zk4dkd6q2rv0fbylp2fprizahfx2imczhrj08n0qd5h3mnck3c9";
        libraryHaskellDepends = [
-         aeson auto-update base buffer-builder bytestring lens lifted-base
-         monad-control network old-locale text time transformers-base
+         aeson auto-update base buffer-builder bytestring dlist http-client
+         http-client-tls http-types lens lifted-base monad-control network
+         old-locale text time transformers-base unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson auto-update base buffer-builder bytestring Cabal dlist
+         exceptions hspec http-client http-client-tls http-types lens
+         lifted-base monad-control network old-locale random text time
+         transformers-base unordered-containers vector
        ];
        homepage = "https://github.com/iand675/datadog";
-       description = "Datadog client for Haskell. Currently only StatsD supported, other support forthcoming.";
+       description = "Datadog client for Haskell. Supports both the HTTP API and StatsD.";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -57060,6 +57324,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "dejafu_1_0_0_0" = callPackage
+    ({ mkDerivation, base, concurrency, containers, deepseq, exceptions
+     , leancheck, profunctors, random, ref-fd, transformers
+     }:
+     mkDerivation {
+       pname = "dejafu";
+       version = "1.0.0.0";
+       sha256 = "0d7darip6dkvpn9gqvr8lkid0b19a5sxd31f5rn8b5fpgc368i8v";
+       libraryHaskellDepends = [
+         base concurrency containers deepseq exceptions leancheck
+         profunctors random ref-fd transformers
+       ];
+       homepage = "https://github.com/barrucadu/dejafu";
+       description = "A library for unit-testing concurrent programs";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "deka" = callPackage
     ({ mkDerivation, base, bytestring, mpdec, parsec, transformers }:
      mkDerivation {
@@ -57664,8 +57946,8 @@ self: {
     ({ mkDerivation, base, doctest }:
      mkDerivation {
        pname = "derulo";
-       version = "0.0.3";
-       sha256 = "19g7nrgd5z7larkw1nb4vm9hfid1j8s2pcqyqflff4mp764m2ipg";
+       version = "0.0.4";
+       sha256 = "0xdz9hfh9wyh5pyn82kapbjiq6hgrdr23krb2940q0hr0rf39ssb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -58360,6 +58642,39 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "diagrams-lib_1_4_2" = callPackage
+    ({ mkDerivation, active, adjunctions, array, base, bytestring
+     , cereal, colour, containers, criterion, data-default-class
+     , deepseq, diagrams-core, diagrams-solve, directory, distributive
+     , dual-tree, exceptions, filepath, fingertree, fsnotify, hashable
+     , intervals, JuicyPixels, lens, linear, monoid-extras, mtl
+     , numeric-extras, optparse-applicative, process, profunctors
+     , semigroups, tagged, tasty, tasty-hunit, tasty-quickcheck, text
+     , transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "diagrams-lib";
+       version = "1.4.2";
+       sha256 = "1rdg8b46hc1ybk1y9dw7w725rag58rkr7hs7z3gvk4isxm11gm79";
+       libraryHaskellDepends = [
+         active adjunctions array base bytestring cereal colour containers
+         data-default-class diagrams-core diagrams-solve directory
+         distributive dual-tree exceptions filepath fingertree fsnotify
+         hashable intervals JuicyPixels lens linear monoid-extras mtl
+         optparse-applicative process profunctors semigroups tagged text
+         transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         base deepseq diagrams-solve distributive lens numeric-extras tasty
+         tasty-hunit tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [ base criterion diagrams-core ];
+       homepage = "http://projects.haskell.org/diagrams";
+       description = "Embedded domain-specific language for declarative graphics";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "diagrams-pandoc" = callPackage
     ({ mkDerivation, base, diagrams-builder, diagrams-cairo
      , diagrams-lib, directory, filepath, linear, optparse-applicative
@@ -61543,6 +61858,36 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "dotenv_0_5_2_0" = callPackage
+    ({ mkDerivation, base, base-compat, directory, exceptions, hspec
+     , hspec-megaparsec, megaparsec, optparse-applicative, process, text
+     , transformers, yaml
+     }:
+     mkDerivation {
+       pname = "dotenv";
+       version = "0.5.2.0";
+       sha256 = "1w3jq6jr5n53rwgjcwmbhhba3nfc073sc9ff6f8672jwsscvlnc1";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base base-compat directory exceptions megaparsec process text
+         transformers yaml
+       ];
+       executableHaskellDepends = [
+         base base-compat megaparsec optparse-applicative process text
+         transformers yaml
+       ];
+       testHaskellDepends = [
+         base base-compat directory exceptions hspec hspec-megaparsec
+         megaparsec process text transformers yaml
+       ];
+       homepage = "https://github.com/stackbuilders/dotenv-hs";
+       description = "Loads environment variables from dotenv files";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dotfs" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , haskell-src, HFuse, HUnit, parsec, process, QuickCheck
@@ -62076,6 +62421,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "drifter-postgresql_0_2_1" = callPackage
+    ({ mkDerivation, base, containers, drifter, either, mtl
+     , postgresql-simple, tasty, tasty-hunit, text, time, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "drifter-postgresql";
+       version = "0.2.1";
+       sha256 = "0p7ddvfmjhf22psga0phhw2m0sdhymsc5k13jrwrdawsxivh2clk";
+       libraryHaskellDepends = [
+         base containers drifter mtl postgresql-simple time transformers
+         transformers-compat
+       ];
+       testHaskellDepends = [
+         base drifter either postgresql-simple tasty tasty-hunit text
+       ];
+       homepage = "http://github.com/michaelxavier/drifter-postgresql";
+       description = "PostgreSQL support for the drifter schema migration tool";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "drinkery" = callPackage
     ({ mkDerivation, base, criterion, mtl, transformers }:
      mkDerivation {
@@ -64150,16 +64517,17 @@ self: {
      }) {};
 
   "ekg-elasticsearch" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, ekg-core, hostname
-     , http-client, lens, text, time, unordered-containers, wreq
+    ({ mkDerivation, aeson, base, bytestring, data-default-class
+     , ekg-core, hostname, http-client, lens, req, text, time
+     , unordered-containers
      }:
      mkDerivation {
        pname = "ekg-elasticsearch";
-       version = "0.3.1.1";
-       sha256 = "0v78xrmnxx6z0lgx8lvc15hmd0zgm2kqibvkf9sj3cdza75vsr1q";
+       version = "0.4.0.0";
+       sha256 = "03bh278n6xvvjr9z8lws25nf1x0j5rw12zmd7h55vmfjn0iblajy";
        libraryHaskellDepends = [
-         aeson base bytestring ekg-core hostname http-client lens text time
-         unordered-containers wreq
+         aeson base bytestring data-default-class ekg-core hostname
+         http-client lens req text time unordered-containers
        ];
        homepage = "https://github.com/cdodev/ekg-elasticsearch";
        description = "Push metrics to elasticsearch";
@@ -65757,8 +66125,8 @@ self: {
      }:
      mkDerivation {
        pname = "epub-tools";
-       version = "2.9";
-       sha256 = "198fzgd04j1dyiv9cpkg6aqvawfiqb4k5awyqbiw6ll84sy0ymgb";
+       version = "2.10";
+       sha256 = "0bahnq1fs31j5bmfm5pi9cn72c64bv5ib29w5qw1lqhp10zr3j17";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -65768,7 +66136,7 @@ self: {
        testHaskellDepends = [
          base directory epub-metadata filepath HUnit mtl parsec regex-compat
        ];
-       homepage = "http://hub.darcs.net/dino/epub-tools";
+       homepage = "https://github.com/dino-/epub-tools.git";
        description = "Command line utilities for working with epub files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -66443,8 +66811,8 @@ self: {
      }:
      mkDerivation {
        pname = "ethereum-analyzer";
-       version = "3.2.0";
-       sha256 = "1rqzx2b6fn8vzls05g7hs163h5fjw2cdhkyqbfr8a7p9cyv32nk8";
+       version = "3.3.4";
+       sha256 = "0d9xw77i8dzb4sk3j7qhnbdand58vz1bhfvqb0qhvg0qdfg732vi";
        libraryHaskellDepends = [
          aeson base bimap bytestring containers ethereum-analyzer-deps extra
          fgl GenericPretty graphviz hexstring hoopl pretty protolude split
@@ -66469,8 +66837,8 @@ self: {
      }:
      mkDerivation {
        pname = "ethereum-analyzer-cli";
-       version = "3.2.0";
-       sha256 = "1svyxmk4441x95xxfqn3z18dqvkqykyksqiyb4298pb8g0cq54sx";
+       version = "3.3.4";
+       sha256 = "1bpr5l8hsn6ggiqs3b4mw27r52ikpqibdhn4w22k1gk8mdfr9gzc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -66496,8 +66864,8 @@ self: {
      }:
      mkDerivation {
        pname = "ethereum-analyzer-deps";
-       version = "3.2.0";
-       sha256 = "1ahpk43ihr3ddzzpxi6vx27f77i84grny5avsakjn0hlzz3ady19";
+       version = "3.3.4";
+       sha256 = "00v0f797z99yil4ihgirsyw9l4yiscg3aidlwjq4maixvzsqvr02";
        libraryHaskellDepends = [
          aeson ansi-wl-pprint base base16-bytestring binary bytestring
          containers deepseq fast-logger global-lock monad-logger split text
@@ -66516,8 +66884,8 @@ self: {
      }:
      mkDerivation {
        pname = "ethereum-analyzer-webui";
-       version = "3.2.0";
-       sha256 = "17hmsmr13qvmfl9w9yfmxbbi6lv3b3r3kqsgnbji5i01jvgnggvs";
+       version = "3.3.4";
+       sha256 = "11h5q6xmig8fk3bxk797s231pk5dnsvvxs9r68zbxv7jk466yq97";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -66664,6 +67032,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "euler-tour-tree" = callPackage
+    ({ mkDerivation, base, containers, fingertree, hlint, keys, mtl
+     , parser-combinators, QuickCheck, sequence, tasty, tasty-hunit
+     , tasty-quickcheck, transformers, Unique
+     }:
+     mkDerivation {
+       pname = "euler-tour-tree";
+       version = "0.1.0.0";
+       sha256 = "0fyz5dyqcgbzpizdpkfd5ndbgpd059cv9f1z84zr5l8wv967c1xf";
+       libraryHaskellDepends = [
+         base containers fingertree mtl parser-combinators transformers
+         Unique
+       ];
+       testHaskellDepends = [
+         base containers hlint keys QuickCheck sequence tasty tasty-hunit
+         tasty-quickcheck
+       ];
+       homepage = "https://github.com/k0ral/euler-tour-tree";
+       description = "Euler tour trees";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "euphoria" = callPackage
     ({ mkDerivation, base, containers, criterion, deepseq, elerea
      , enummapset-th, hashable, HUnit, test-framework
@@ -67042,15 +67432,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "eventsource-geteventstore-store_1_0_5" = callPackage
+  "eventsource-geteventstore-store_1_0_6" = callPackage
     ({ mkDerivation, aeson, base, eventsource-api
      , eventsource-store-specs, eventstore, mtl, protolude
      , string-conversions, tasty, tasty-hspec, transformers-base
      }:
      mkDerivation {
        pname = "eventsource-geteventstore-store";
-       version = "1.0.5";
-       sha256 = "0lbgjbl14p6480pmr27zls91g0zy8g0id59ls0hajaghwibcabb6";
+       version = "1.0.6";
+       sha256 = "0fy1sgc43a6d4hrwyc3kawcnvpm4zlmwnznw27zd40hrbzkkkzw2";
        libraryHaskellDepends = [
          aeson base eventsource-api eventstore mtl string-conversions
          transformers-base
@@ -68216,6 +68606,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "extensible-effects_2_2_1_0" = callPackage
+    ({ mkDerivation, base, criterion, directory, HUnit, mtl, QuickCheck
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , test-framework-th, transformers, transformers-base, type-aligned
+     }:
+     mkDerivation {
+       pname = "extensible-effects";
+       version = "2.2.1.0";
+       sha256 = "1x21y5ilv5hka4cx7il53gr89hpap577pacfg8v23zbravi270zr";
+       libraryHaskellDepends = [
+         base transformers transformers-base type-aligned
+       ];
+       testHaskellDepends = [
+         base directory HUnit QuickCheck test-framework test-framework-hunit
+         test-framework-quickcheck2 test-framework-th
+       ];
+       benchmarkHaskellDepends = [ base criterion mtl ];
+       homepage = "https://github.com/suhailshergill/extensible-effects";
+       description = "An Alternative to Monad Transformers";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "extensible-exceptions" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -71738,6 +72151,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "flow_1_0_10" = callPackage
+    ({ mkDerivation, base, doctest, QuickCheck, template-haskell }:
+     mkDerivation {
+       pname = "flow";
+       version = "1.0.10";
+       sha256 = "1k8p475m1485nq4236jf53gmls264c5dy8x57zihb7gbvgnl71fj";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "flow-er" = callPackage
     ({ mkDerivation, base, doctest, flow, QuickCheck }:
      mkDerivation {
@@ -71917,8 +72344,8 @@ self: {
      }:
      mkDerivation {
        pname = "fltkhs";
-       version = "0.5.4.1";
-       sha256 = "0yclwq488g9mz6wsjcch7c5kwgc97rxp0lqjlfj44vbqbjk72l5x";
+       version = "0.5.4.2";
+       sha256 = "1zhrc5b0czz69lh2dm5z4kxrf2clm3j4xbljf0chg9xkvid063x9";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal directory filepath ];
@@ -72878,6 +73305,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "formatting_6_3_0" = callPackage
+    ({ mkDerivation, array, base, bytestring, clock, ghc-prim, hspec
+     , integer-gmp, old-locale, scientific, text, time, transformers
+     }:
+     mkDerivation {
+       pname = "formatting";
+       version = "6.3.0";
+       sha256 = "16xngayk1jd92bj2qaf7fmrgzdskdnc7rsgpk1ij06xd8cdgahf1";
+       libraryHaskellDepends = [
+         array base bytestring clock ghc-prim integer-gmp old-locale
+         scientific text time transformers
+       ];
+       testHaskellDepends = [ base hspec ];
+       description = "Combinator-based type-safe formatting (like printf() or FORMAT)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "forml" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, cereal
      , containers, directory, file-embed, ghc-prim, GraphSCC, hslogger
@@ -73968,8 +74413,8 @@ self: {
      }:
      mkDerivation {
        pname = "friday-juicypixels";
-       version = "0.1.2.2";
-       sha256 = "1sci0whrkjlm731z1qk7p7sg7vaw61brcb167w9f6fbkagn2f67l";
+       version = "0.1.2.3";
+       sha256 = "19j321vqca8sl366j3acdskr8zhzcki429zxzs8xawdmxqh93vzv";
        libraryHaskellDepends = [ base friday JuicyPixels vector ];
        testHaskellDepends = [
          base bytestring file-embed friday hspec JuicyPixels
@@ -74022,6 +74467,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "frisby_0_2_2" = callPackage
+    ({ mkDerivation, array, base, containers, mtl, semigroups }:
+     mkDerivation {
+       pname = "frisby";
+       version = "0.2.2";
+       sha256 = "1mdncc38qwakadr8q4ncz9vzvx9scfhlgk2m540y2mjdypdiicy1";
+       libraryHaskellDepends = [ array base containers mtl semigroups ];
+       homepage = "http://repetae.net/computer/frisby/";
+       description = "Linear time composable parser for PEG grammars";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "from-sum" = callPackage
     ({ mkDerivation, base, doctest, Glob, mtl }:
      mkDerivation {
@@ -77673,8 +78131,8 @@ self: {
     ({ mkDerivation, base, cpphs, ghc, happy }:
      mkDerivation {
        pname = "ghc-parser";
-       version = "0.2.0.0";
-       sha256 = "0jd02qgjs529ac0jvg59rgrjvpm541j993lyfpqr9aqwqj1n3ylp";
+       version = "0.2.0.1";
+       sha256 = "10xx2d9awgizjz1jrlw2m30nsl938mh297azp7zay7zkdzsv0fyh";
        libraryHaskellDepends = [ base ghc ];
        libraryToolDepends = [ cpphs happy ];
        homepage = "https://github.com/gibiansky/IHaskell";
@@ -77731,12 +78189,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ghc-prim_0_5_1_0" = callPackage
+  "ghc-prim_0_5_1_1" = callPackage
     ({ mkDerivation, rts }:
      mkDerivation {
        pname = "ghc-prim";
-       version = "0.5.1.0";
-       sha256 = "13ypjfpz5b4zpbr2q8x37nbqjd0224l9g8xn62iv7mbqbgynkbf9";
+       version = "0.5.1.1";
+       sha256 = "1dkl0l891min86jpndcah8dx7i3ssnaj6yf2ghxplp8619bmqhb2";
        libraryHaskellDepends = [ rts ];
        description = "GHC primitives";
        license = stdenv.lib.licenses.bsd3;
@@ -77846,10 +78304,8 @@ self: {
     ({ mkDerivation, array, base, containers, ghc, hpc }:
      mkDerivation {
        pname = "ghc-srcspan-plugin";
-       version = "0.2.2.0";
-       sha256 = "1wdgc1m914iy4876cf8qwxad0q2abqvs10f6dj0dnfs6sgqyqdz1";
-       revision = "1";
-       editedCabalFile = "1h821qji9xgf9d4sd040fw10v1312dxzin556ppc67wxbx5mjc9i";
+       version = "0.2.2.1";
+       sha256 = "10zh7i4nx4ds3f1d7m2m1caqnxmi3dh6a900fl8mcp6a09isvglh";
        libraryHaskellDepends = [ array base containers ghc hpc ];
        description = "Generic GHC Plugin for annotating Haskell code with source location data";
        license = stdenv.lib.licenses.bsd3;
@@ -79979,6 +80435,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "github-release_1_1_2" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, http-client
+     , http-client-tls, http-types, mime-types, optparse-generic, text
+     , unordered-containers, uri-templater
+     }:
+     mkDerivation {
+       pname = "github-release";
+       version = "1.1.2";
+       sha256 = "0czc53xwg21jvd7g4ggjva0nzc2rpyf36rc4876dss9lckcc2p93";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring http-client http-client-tls http-types
+         mime-types optparse-generic text unordered-containers uri-templater
+       ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/tfausak/github-release#readme";
+       description = "Upload files to GitHub releases";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "github-tools" = callPackage
     ({ mkDerivation, base, bytestring, containers, exceptions, github
      , groom, html, http-client, http-client-tls, monad-parallel
@@ -88172,8 +88650,8 @@ self: {
     ({ mkDerivation, base, hakyll, ogmarkup }:
      mkDerivation {
        pname = "hakyll-ogmarkup";
-       version = "3.0";
-       sha256 = "088hcjy34xxyaphy8c7kj82w88pwzdaww1xww791hjrq0r75icf7";
+       version = "4.0";
+       sha256 = "1w8wmqdfxf9w4mb9k77gak9iqxysa7mbb5phfh9a0hy30vx2qb1d";
        libraryHaskellDepends = [ base hakyll ogmarkup ];
        homepage = "https://github.com/ogma-project/hakyll-ogmarkup#readme";
        description = "Integrate ogmarkup document with Hakyll";
@@ -92277,8 +92755,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-updater";
-       version = "1.3";
-       sha256 = "1q9rjy36wqagy665k0ifnfwr9r1fy2if5gnva9q069hdir15lkzm";
+       version = "1.3.1";
+       sha256 = "0q2aix579mm3ksi0hipcmw8g2p5xfbgk6ph7jnraq5i2rxjchg7v";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -93520,6 +93998,38 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hasmin_1_0_1" = callPackage
+    ({ mkDerivation, attoparsec, base, bifunctors, bytestring
+     , containers, criterion, directory, doctest, doctest-discover
+     , gitrev, hopfli, hspec, hspec-attoparsec, matrix, mtl, numbers
+     , optparse-applicative, parsers, QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "hasmin";
+       version = "1.0.1";
+       sha256 = "1h5ygl9qmzmbhqfb58hhm2zw850dqfkp4b8cp3bhsnangg4lgbjk";
+       revision = "1";
+       editedCabalFile = "18qpp71nkf0sayzwxwfn2nz1g8fklsa55h2jrazqilhrdq82gq7d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base bifunctors containers matrix mtl numbers parsers
+         text
+       ];
+       executableHaskellDepends = [
+         base bytestring gitrev hopfli optparse-applicative text
+       ];
+       testHaskellDepends = [
+         attoparsec base doctest doctest-discover hspec hspec-attoparsec mtl
+         QuickCheck text
+       ];
+       benchmarkHaskellDepends = [ base criterion directory text ];
+       homepage = "https://github.com/contivero/hasmin#readme";
+       description = "CSS Minifier";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hasparql-client" = callPackage
     ({ mkDerivation, base, HTTP, monads-fd, network, xml }:
      mkDerivation {
@@ -96313,6 +96823,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "here_1_2_12" = callPackage
+    ({ mkDerivation, base, haskell-src-meta, mtl, parsec
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "here";
+       version = "1.2.12";
+       sha256 = "0kiwcknk145z7y48qgpf73f0kwz4nnqa72q14vypy21sb5bpcgxc";
+       libraryHaskellDepends = [
+         base haskell-src-meta mtl parsec template-haskell
+       ];
+       homepage = "https://github.com/tmhedberg/here";
+       description = "Here docs & interpolated strings via quasiquotation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "heredoc" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -99165,8 +99692,8 @@ self: {
     ({ mkDerivation, base, hledger-lib, text, time }:
      mkDerivation {
        pname = "hledger-diff";
-       version = "0.2.0.11";
-       sha256 = "1y5f7xdw1rriz2d7qxnkywyjsa09bk6712rks3l1zkihi5i3fnr7";
+       version = "0.2.0.12";
+       sha256 = "074yqf8xsa1crfjxf2inn37bn0qm0dbxl0mlnxxlx4cqyjyqsz7h";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base hledger-lib text time ];
@@ -99185,10 +99712,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-iadd";
-       version = "1.2.6";
-       sha256 = "1l5vzhyya5h6sc3l74iy0mnys8bcjp6m5z0m3lqabk37ik31ld36";
-       revision = "8";
-       editedCabalFile = "0fjlyb3pbn5dfkns8hlb696aawmw6gkm1ad2la0aiy2kyzhvl838";
+       version = "1.3.0";
+       sha256 = "0kr0s2zdi1453cfbwm5i99ajybk72q012k9bd13lwc22fksph9xq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -108554,6 +109079,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hunit-dejafu_1_0_0_0" = callPackage
+    ({ mkDerivation, base, dejafu, exceptions, HUnit }:
+     mkDerivation {
+       pname = "hunit-dejafu";
+       version = "1.0.0.0";
+       sha256 = "1xsfv8pdkmyplggzk0k17j1y10kbjrvb86izsnc9k2w0lmd1j6ji";
+       libraryHaskellDepends = [ base dejafu exceptions HUnit ];
+       homepage = "https://github.com/barrucadu/dejafu";
+       description = "Deja Fu support for the HUnit test framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hunit-gui" = callPackage
     ({ mkDerivation, base, cairo, gtk, haskell98, HUnit }:
      mkDerivation {
@@ -111375,8 +111913,8 @@ self: {
      }:
      mkDerivation {
        pname = "ihaskell";
-       version = "0.9.0.1";
-       sha256 = "1xfp0pzxsfcz8h4f27fqvbc6pprwz45cgq5sa393z3wqy17ni4lq";
+       version = "0.9.0.2";
+       sha256 = "0pa366b4vn5hc9ymd4g1pr4dsffvk80x9c8yq4d1pf4jngjfayql";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -111407,8 +111945,8 @@ self: {
      }:
      mkDerivation {
        pname = "ihaskell-aeson";
-       version = "0.3.0.0";
-       sha256 = "0h2bbkqwl8mdyn24n0lphcjfrvmfq8ckincv3rncspp9h0v705m7";
+       version = "0.3.0.1";
+       sha256 = "1ds13a2j2bdr86gcb6vr8dfsb9fjia670lzwwqk4hsvyjgsbd2d7";
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring here ihaskell text
        ];
@@ -111435,8 +111973,8 @@ self: {
     ({ mkDerivation, base, blaze-html, blaze-markup, ihaskell }:
      mkDerivation {
        pname = "ihaskell-blaze";
-       version = "0.3.0.0";
-       sha256 = "1il3iz1nksh5v753srvchrjdazf7dqsd3q59w7crzbyrlx81v97b";
+       version = "0.3.0.1";
+       sha256 = "1733lg13v3pn95249gxbxrvbwfg2a95badvf98vkx6hx2mbxv9q7";
        libraryHaskellDepends = [ base blaze-html blaze-markup ihaskell ];
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instances for blaze-html types";
@@ -111450,8 +111988,8 @@ self: {
      }:
      mkDerivation {
        pname = "ihaskell-charts";
-       version = "0.3.0.0";
-       sha256 = "0nlimyx953v1s4xgzdb9987i9bw1bdralkg2x6cp41kzqd49i4f3";
+       version = "0.3.0.1";
+       sha256 = "1m7jxl1pxl0hcfa24xgjcwj4k50an8phm2lkpr4493yr1x2isk35";
        libraryHaskellDepends = [
          base bytestring Chart Chart-cairo data-default-class directory
          ihaskell
@@ -111468,8 +112006,8 @@ self: {
      }:
      mkDerivation {
        pname = "ihaskell-diagrams";
-       version = "0.3.1.0";
-       sha256 = "18q7m6xrshn1ixn0j75bdvpgvjq63sic3dfjzcz9zk73zmvpj4qz";
+       version = "0.3.1.1";
+       sha256 = "1c6a469ymfcjmf4larh1sh6qzaxgq260r55vzx78irh036k5h0lc";
        libraryHaskellDepends = [
          active base bytestring diagrams diagrams-cairo diagrams-lib
          directory ihaskell text
@@ -111493,12 +112031,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ihaskell-gnuplot" = callPackage
+    ({ mkDerivation, base, bytestring, gnuplot, ihaskell }:
+     mkDerivation {
+       pname = "ihaskell-gnuplot";
+       version = "0.1.0.1";
+       sha256 = "1qdcx0y52w805z5dg2xwsy1ykbbk05i4k04y0w3r4r3wwjvq3kk6";
+       libraryHaskellDepends = [ base bytestring gnuplot ihaskell ];
+       homepage = "http://www.github.com/gibiansky/ihaskell";
+       description = "IHaskell display instance for Gnuplot (from gnuplot package)";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "ihaskell-hatex" = callPackage
     ({ mkDerivation, base, HaTeX, ihaskell, text }:
      mkDerivation {
        pname = "ihaskell-hatex";
-       version = "0.2.1.0";
-       sha256 = "098mbabwsl5i5dnvdy732ivrpzyb5njpr4483zss22axdni9p68i";
+       version = "0.2.1.1";
+       sha256 = "0rsfavpxm14bbrjcsi9rps3p1bjhhgvam0znhn8vwfmic3fpsda8";
        libraryHaskellDepends = [ base HaTeX ihaskell text ];
        homepage = "http://www.github.com/gibiansky/IHaskell";
        description = "IHaskell display instances for hatex";
@@ -111530,8 +112080,8 @@ self: {
      }:
      mkDerivation {
        pname = "ihaskell-juicypixels";
-       version = "0.3.0.0";
-       sha256 = "0apsll540z4hzzs39bqk14iadnr4rjp873q712la7lp2xnyf4k0y";
+       version = "1.1.0.1";
+       sha256 = "1fjngq27572rlri9m6674ddbgqh5ygl5dagma3z50m1l8n0g7z6s";
        libraryHaskellDepends = [
          base bytestring directory ihaskell JuicyPixels
        ];
@@ -111547,8 +112097,8 @@ self: {
      }:
      mkDerivation {
        pname = "ihaskell-magic";
-       version = "0.3.0.0";
-       sha256 = "05jvyca163daqrmpb7fhk1wng04vk4bayffp0lp68sy3zskrjndl";
+       version = "0.3.0.1";
+       sha256 = "02zqlvnl73qkbx1yx7fc9dwcg3k7fk9jr9iqn22l38wsk01nm7c2";
        libraryHaskellDepends = [
          base base64-bytestring bytestring ihaskell ipython-kernel magic
          text utf8-string
@@ -111577,12 +112127,12 @@ self: {
      }) {};
 
   "ihaskell-plot" = callPackage
-    ({ mkDerivation, base, bytestring, ihaskell, plot }:
+    ({ mkDerivation, base, bytestring, hmatrix, ihaskell, plot }:
      mkDerivation {
        pname = "ihaskell-plot";
-       version = "0.3.0.0";
-       sha256 = "17qp2ln9v4sv9i3biyxgyq0csqikxwm5gs612fn5zsl1ixznj1h1";
-       libraryHaskellDepends = [ base bytestring ihaskell plot ];
+       version = "0.3.0.1";
+       sha256 = "12bi8im5489kmy0d26kn3hljkj4c1xynsa97h6nh5dp53awklm3y";
+       libraryHaskellDepends = [ base bytestring hmatrix ihaskell plot ];
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instance for Plot (from plot package)";
        license = stdenv.lib.licenses.mit;
@@ -111614,8 +112164,8 @@ self: {
      }:
      mkDerivation {
        pname = "ihaskell-widgets";
-       version = "0.2.3.1";
-       sha256 = "0ay3wpv8ayyxvky3cpyzmwpbgkxc76avr119nb632a7nig74rzvp";
+       version = "0.2.3.2";
+       sha256 = "18kp3s534k241ld1s0ds5hln47pc863dfs3i6r9w67adnf6qhff8";
        libraryHaskellDepends = [
          aeson base containers ihaskell ipython-kernel scientific singletons
          text unix unordered-containers vector vinyl
@@ -112100,6 +112650,40 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "importify_1_0_1" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, autoexporter, base
+     , bytestring, Cabal, containers, filepath, fmt, foldl, hashable
+     , haskell-names, haskell-src-exts, hse-cpp, hspec, log-warper
+     , microlens-platform, optparse-applicative, path, path-io
+     , pretty-simple, syb, template-haskell, text, text-format, turtle
+     , universum, unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "importify";
+       version = "1.0.1";
+       sha256 = "1snm75p3p3nvjclqis6qglb17gr0pm2dw0i980jpzrqm3n3kciy3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-pretty autoexporter base bytestring Cabal containers
+         filepath fmt foldl hashable haskell-names haskell-src-exts hse-cpp
+         log-warper microlens-platform path path-io pretty-simple syb
+         template-haskell text text-format turtle universum
+         unordered-containers yaml
+       ];
+       executableHaskellDepends = [
+         base log-warper optparse-applicative path path-io text universum
+       ];
+       testHaskellDepends = [
+         base filepath hspec log-warper microlens-platform path path-io
+         universum unordered-containers
+       ];
+       homepage = "https://github.com/serokell/importify";
+       description = "Tool for haskell imports refactoring";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "imports" = callPackage
     ({ mkDerivation, base, directory, filepath, mtl }:
      mkDerivation {
@@ -114444,6 +115028,32 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ipython-kernel_0_9_0_1" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cereal, containers
+     , directory, filepath, mtl, parsec, process, SHA, temporary, text
+     , transformers, unordered-containers, uuid, zeromq4-haskell
+     }:
+     mkDerivation {
+       pname = "ipython-kernel";
+       version = "0.9.0.1";
+       sha256 = "0nzl5zcl03cdp0l6idscp648n64qjnhvfyj2j47fiiy1fkz133s7";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base bytestring cereal containers directory filepath mtl
+         process SHA temporary text transformers unordered-containers uuid
+         zeromq4-haskell
+       ];
+       executableHaskellDepends = [
+         base filepath mtl parsec text transformers
+       ];
+       homepage = "http://github.com/gibiansky/IHaskell";
+       description = "A library for creating kernels for IPython frontends";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "irc" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, HUnit, QuickCheck
      , test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -116892,8 +117502,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-feed";
-       version = "0.0.2";
-       sha256 = "0ka8g2d3hn8z122k8r7gxs8m72s4ys46j6s2yc2ys045r1fhzlc1";
+       version = "0.0.6";
+       sha256 = "1mmxwhdrvxx5y0s8d7lxggjd396g3ga69zj6c2s020kdakhplnam";
        libraryHaskellDepends = [
          aeson base bytestring mime-types network-uri tagsoup text time
        ];
@@ -117585,8 +118195,8 @@ self: {
      }:
      mkDerivation {
        pname = "judy";
-       version = "0.3.0";
-       sha256 = "17fblav2npg47kn2dq82lcpf299igd91pi0ynffklf5hr8dw70zl";
+       version = "0.4.0";
+       sha256 = "115991jvp9gg9iy3n8p8y0y39x236v17g5xqchmlfsja1nx9hbzc";
        libraryHaskellDepends = [ base bytestring ghc-prim ];
        librarySystemDepends = [ Judy ];
        testHaskellDepends = [ base hspec QuickCheck ];
@@ -119805,6 +120415,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "lackey_0_4_7" = callPackage
+    ({ mkDerivation, base, hspec, servant, servant-foreign, text }:
+     mkDerivation {
+       pname = "lackey";
+       version = "0.4.7";
+       sha256 = "026w7wmz71g9796mx6mdn3s1nxrds631kacn423zdvchridm0398";
+       libraryHaskellDepends = [ base servant servant-foreign text ];
+       testHaskellDepends = [ base hspec servant servant-foreign text ];
+       homepage = "https://github.com/tfausak/lackey#readme";
+       description = "Generate Ruby clients from Servant APIs";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lagrangian" = callPackage
     ({ mkDerivation, ad, base, hmatrix, HUnit, nonlinear-optimization
      , test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -121457,7 +122081,7 @@ self: {
        homepage = "http://lpuppet.banquise.net/";
        description = "Tools to parse and evaluate the Puppet DSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "x86_64-linux" ];
      }) {};
 
   "language-python" = callPackage
@@ -126918,6 +127542,39 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "log-warper_1_8_3" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, async, base, containers
+     , data-default, deepseq, directory, filepath, fmt, hspec, HUnit
+     , markdown-unlit, microlens-mtl, microlens-platform, mmorph
+     , monad-control, monad-loops, mtl, QuickCheck, text, time
+     , transformers, transformers-base, universum, unix
+     , unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "log-warper";
+       version = "1.8.3";
+       sha256 = "1awblvxh6cncwlqacxb1wq4s77x79ncrz6dl81wgrbjjifwpf0xz";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-terminal base containers deepseq directory filepath fmt
+         microlens-platform mmorph monad-control monad-loops mtl text time
+         transformers transformers-base universum unix unordered-containers
+         vector yaml
+       ];
+       executableHaskellDepends = [
+         base markdown-unlit mtl text universum yaml
+       ];
+       testHaskellDepends = [
+         async base data-default directory filepath hspec HUnit
+         microlens-mtl QuickCheck universum unordered-containers
+       ];
+       homepage = "https://github.com/serokell/log-warper";
+       description = "Flexible, configurable, monadic and pretty logging";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "log2json" = callPackage
     ({ mkDerivation, base, containers, json, parsec }:
      mkDerivation {
@@ -128417,6 +129074,37 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "lxd-client_0_1_0_5" = callPackage
+    ({ mkDerivation, aeson, async, base, bimap, bytestring, connection
+     , containers, data-default, directory, either, exceptions, filepath
+     , hspec, hspec-core, http-api-data, http-client, http-client-tls
+     , http-media, http-types, mtl, network, random, semigroups, servant
+     , servant-client, text, tls, transformers, turtle, unix, uuid
+     , websockets, x509, x509-store, x509-validation
+     }:
+     mkDerivation {
+       pname = "lxd-client";
+       version = "0.1.0.5";
+       sha256 = "1981q1b71xgmxlis2hydhzhcwcspyrwnllg3fdrajv7m9z1zlryc";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson async base bimap bytestring connection containers
+         data-default directory either exceptions filepath http-api-data
+         http-client http-client-tls http-media http-types mtl network
+         semigroups servant servant-client text tls transformers unix
+         websockets x509 x509-store x509-validation
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base exceptions hspec hspec-core random text turtle uuid
+       ];
+       homepage = "https://github.com/hverr/haskell-lxd-client#readme";
+       description = "LXD client written in Haskell";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lxd-client-config" = callPackage
     ({ mkDerivation, aeson, base, containers, directory, filepath
      , HUnit, QuickCheck, test-framework, test-framework-hunit
@@ -131903,6 +132591,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "memory_0_14_11" = callPackage
+    ({ mkDerivation, base, basement, bytestring, deepseq, foundation
+     , ghc-prim, tasty, tasty-hunit, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "memory";
+       version = "0.14.11";
+       sha256 = "0k6x58r3if8zbsgip8nr7lb77xf468qxlwqnmah8p313rxfg0k37";
+       libraryHaskellDepends = [
+         base basement 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 {
@@ -133757,24 +134465,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "mmark_0_0_3_1" = callPackage
+  "mmark_0_0_3_2" = callPackage
     ({ mkDerivation, aeson, base, case-insensitive, containers
-     , criterion, data-default-class, deepseq, email-validate, foldl
-     , hashable, hspec, hspec-megaparsec, html-entity-map, lucid
+     , criterion, data-default-class, deepseq, dlist, email-validate
+     , foldl, hashable, hspec, hspec-megaparsec, html-entity-map, lucid
      , megaparsec, microlens, microlens-th, modern-uri, mtl
      , parser-combinators, QuickCheck, text, text-metrics
      , unordered-containers, weigh, yaml
      }:
      mkDerivation {
        pname = "mmark";
-       version = "0.0.3.1";
-       sha256 = "0q6abmml27qww95hzpck4mjshaxhz3pmpzgxdbg8bnaaa6prv0jp";
+       version = "0.0.3.2";
+       sha256 = "0z3dgdq0x4brr56gcrjwssbxlwpaycrz1f5cxdnh2nzpz2dw9s2i";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base case-insensitive containers data-default-class deepseq
-         email-validate foldl hashable html-entity-map lucid megaparsec
-         microlens microlens-th modern-uri mtl parser-combinators text
-         text-metrics unordered-containers yaml
+         dlist email-validate foldl hashable html-entity-map lucid
+         megaparsec microlens microlens-th modern-uri mtl parser-combinators
+         text text-metrics unordered-containers yaml
        ];
        testHaskellDepends = [
          aeson base foldl hspec hspec-megaparsec lucid megaparsec modern-uri
@@ -136187,6 +136895,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "more-containers" = callPackage
+    ({ mkDerivation, base, containers, hspec }:
+     mkDerivation {
+       pname = "more-containers";
+       version = "0.1.0.1";
+       sha256 = "0iqs86py0mz9dsjfrvzf97hg4xsxl0sbqvc8bvfvyglxrxqj53jb";
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [ base containers hspec ];
+       homepage = "https://github.com/mtth/more-containers#readme";
+       description = "A few more collections";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "more-extensible-effects" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -136407,8 +137128,8 @@ self: {
      }:
      mkDerivation {
        pname = "movie-monad";
-       version = "0.0.2.0";
-       sha256 = "0cf4hrakz6cw1c3izrrckhjjhn8hd8cn9gfh41v2xi8kcn6bbciw";
+       version = "0.0.3.0";
+       sha256 = "1dwkf378bq0xkf60h3gxaq431m4gxr6wk17549yc6bbc4zx2q7vq";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -138803,6 +139524,40 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "nakadi-client_0_4_0_0" = callPackage
+    ({ mkDerivation, aeson, aeson-casing, async, base, bytestring
+     , classy-prelude, conduit, conduit-combinators, conduit-extra
+     , containers, hashable, http-client, http-client-tls, http-conduit
+     , http-types, iso8601-time, lens, lens-aeson, monad-logger, mtl
+     , random, resourcet, retry, safe-exceptions, say, scientific, split
+     , stm, tasty, tasty-hunit, template-haskell, text, time
+     , transformers, unordered-containers, uuid, vector, wai, warp
+     }:
+     mkDerivation {
+       pname = "nakadi-client";
+       version = "0.4.0.0";
+       sha256 = "0aixamqvlm7as8cfgp8b36smh139kwp5qny51dgzsczg6sr7gdk0";
+       libraryHaskellDepends = [
+         aeson aeson-casing base bytestring conduit conduit-combinators
+         conduit-extra containers hashable http-client http-client-tls
+         http-conduit http-types iso8601-time lens monad-logger mtl
+         resourcet retry safe-exceptions scientific split template-haskell
+         text time transformers unordered-containers uuid vector
+       ];
+       testHaskellDepends = [
+         aeson aeson-casing async base bytestring classy-prelude conduit
+         conduit-combinators conduit-extra containers hashable http-client
+         http-client-tls http-conduit http-types iso8601-time lens
+         lens-aeson monad-logger mtl random resourcet retry safe-exceptions
+         say scientific split stm tasty tasty-hunit template-haskell text
+         time transformers unordered-containers uuid vector wai warp
+       ];
+       homepage = "https://github.com/mtesseract/nakadi-haskell#readme";
+       description = "Client library for the Nakadi Event Broker";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "namecoin-update" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, lens, text, wreq }:
      mkDerivation {
@@ -140162,6 +140917,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "netwire-input-glfw_0_0_7" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, directory
+     , filepath, GLFW-b, mtl, netwire, netwire-input, OpenGL, stm
+     , transformers
+     }:
+     mkDerivation {
+       pname = "netwire-input-glfw";
+       version = "0.0.7";
+       sha256 = "1rsvhwxrr00qpff7adwiwci5fl6hbv8r8mvxhkq3az235w9pll8g";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers GLFW-b mtl netwire-input stm
+       ];
+       executableHaskellDepends = [
+         array base bytestring containers directory filepath GLFW-b mtl
+         netwire netwire-input OpenGL transformers
+       ];
+       homepage = "https://www.github.com/Mokosha/netwire-input-glfw";
+       description = "GLFW instance of netwire-input";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "netwire-input-javascript" = callPackage
     ({ mkDerivation, base, containers, ghcjs-base, netwire
      , netwire-input, transformers
@@ -141102,8 +141881,8 @@ self: {
      }:
      mkDerivation {
        pname = "network-uri-json";
-       version = "0.1.0.0";
-       sha256 = "0q4h37zf8n56s7jjd5nalk8q6q5hh5d612p7w9agjqwjhl26p782";
+       version = "0.1.1.0";
+       sha256 = "0zacbdnh83559wl4mlavipg637map9sm04ch7md63rgyvvr2v79l";
        libraryHaskellDepends = [ aeson base network-uri text ];
        testHaskellDepends = [
          aeson base hspec network-uri QuickCheck test-invariant text
@@ -141111,7 +141890,7 @@ self: {
        homepage = "https://github.com/alunduil/network-uri-json";
        description = "FromJSON and ToJSON Instances for Network.URI";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ alunduil ];
      }) {};
 
   "network-uri-static" = callPackage
@@ -143738,13 +144517,13 @@ self: {
      }:
      mkDerivation {
        pname = "ogmarkup";
-       version = "3.1.0";
-       sha256 = "0za23qz85r9xmw57gxi84x2zy8ddxwcdphawyfzkmxqny9kplx1r";
+       version = "4.0";
+       sha256 = "06bbh2ylxw33hik1k4ykvmb74qkcn1zda1n1m20lzcp2ji37fp8k";
        libraryHaskellDepends = [ base megaparsec mtl ];
        testHaskellDepends = [
          base hspec hspec-megaparsec megaparsec shakespeare text
        ];
-       homepage = "http://github.com/ogma-project/ogmarkup";
+       homepage = "https://nest.pijul.com/lthms/ogmarkup";
        description = "A lightweight markup language for story writers";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -146604,6 +147383,43 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pandoc-citeproc_0_12_2" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
+     , Cabal, containers, data-default, directory, filepath, hs-bibutils
+     , mtl, old-locale, pandoc, pandoc-types, parsec, process, rfc5051
+     , setenv, split, syb, tagsoup, temporary, text, time
+     , unordered-containers, vector, xml-conduit, yaml
+     }:
+     mkDerivation {
+       pname = "pandoc-citeproc";
+       version = "0.12.2";
+       sha256 = "003hk7xp2r85bb3kziffr3xk4zjn178kzvfy6rh25r5p54vq9749";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       setupHaskellDepends = [ base Cabal ];
+       libraryHaskellDepends = [
+         aeson base bytestring containers data-default directory filepath
+         hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051
+         setenv split syb tagsoup text time unordered-containers vector
+         xml-conduit yaml
+       ];
+       executableHaskellDepends = [
+         aeson aeson-pretty attoparsec base bytestring containers directory
+         filepath mtl pandoc pandoc-types process syb temporary text vector
+         yaml
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers directory filepath mtl pandoc
+         pandoc-types process temporary text yaml
+       ];
+       doCheck = false;
+       homepage = "https://github.com/jgm/pandoc-citeproc";
+       description = "Supports using pandoc with citeproc";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pandoc-citeproc-preamble" = callPackage
     ({ mkDerivation, base, directory, filepath, pandoc-types, process
      }:
@@ -152443,8 +153259,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-transduce";
-       version = "0.4";
-       sha256 = "0krcjw7bry726bgkjfsv72wq6z930jz8n5yj5dzfh51n5ps8qkcq";
+       version = "0.4.1";
+       sha256 = "10lf6fnnq1zf9v04l00f1nd4s6qq6a0pcdl72vxczmj6rn3c0kgq";
        libraryHaskellDepends = [
          base bifunctors bytestring conceit foldl free microlens pipes
          pipes-bytestring pipes-concurrency pipes-group pipes-parse
@@ -153116,14 +153932,18 @@ self: {
      }) {};
 
   "ploton" = callPackage
-    ({ mkDerivation, base, hspec, optparse-applicative, process }:
+    ({ mkDerivation, base, hspec, optparse-applicative, process, split
+     , transformers
+     }:
      mkDerivation {
        pname = "ploton";
-       version = "1.0.0.0";
-       sha256 = "1x2ypljgknyya3pwg2y323va1hl396qm30lfy982sa6p0d0m8hfg";
+       version = "1.1.0.0";
+       sha256 = "0czykw9rcmj1vci9vach4h62kbvcqrswj14d8f5nn6m75cq6swdj";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base optparse-applicative process ];
+       libraryHaskellDepends = [
+         base optparse-applicative process split transformers
+       ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/ishiy1993/ploton#readme";
@@ -154937,6 +155757,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "postgresql-simple-queue_1_0_1" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, exceptions, hspec
+     , hspec-discover, hspec-expectations-lifted, hspec-pg-transact
+     , monad-control, pg-transact, postgresql-simple, random, split, stm
+     , text, time, transformers
+     }:
+     mkDerivation {
+       pname = "postgresql-simple-queue";
+       version = "1.0.1";
+       sha256 = "0gss9s2splrvwgxhkjpqvx0cg9kx9dqpw4aq2wbh8l879v2nj2rk";
+       libraryHaskellDepends = [
+         aeson base bytestring exceptions monad-control pg-transact
+         postgresql-simple random stm text time transformers
+       ];
+       testHaskellDepends = [
+         aeson async base bytestring exceptions hspec hspec-discover
+         hspec-expectations-lifted hspec-pg-transact monad-control
+         pg-transact postgresql-simple random split stm text time
+         transformers
+       ];
+       homepage = "https://github.com/jfischoff/postgresql-queue#readme";
+       description = "A PostgreSQL backed queue";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "postgresql-simple-sop" = callPackage
     ({ mkDerivation, base, generics-sop, postgresql-simple }:
      mkDerivation {
@@ -155575,8 +156421,8 @@ self: {
      }:
      mkDerivation {
        pname = "preamble";
-       version = "0.0.57";
-       sha256 = "04hc8cywmwwjxcgj0h26ahlnxj56awq9jnvpdgxgw5rvw4q4qqb3";
+       version = "0.0.58";
+       sha256 = "02nqrryi2mjp4zcail23rh0ysqnc8i97wzn77bq7ksimqwzynabq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -156943,8 +157789,8 @@ self: {
      }:
      mkDerivation {
        pname = "process-streaming";
-       version = "0.9.1.2";
-       sha256 = "0kjq8bylhab6zhszf9vfnvzjkzfkh3bcgkkys7f13f6mrdp02bjz";
+       version = "0.9.2.1";
+       sha256 = "1p1nfb09sg9krwm7k6j8y5ggbc28yddlkf2yifs06iqfkcmbsbm6";
        libraryHaskellDepends = [
          base bifunctors bytestring conceit free kan-extensions pipes
          pipes-bytestring pipes-concurrency pipes-parse pipes-safe
@@ -157252,12 +158098,12 @@ self: {
      }) {};
 
   "progress-meter" = callPackage
-    ({ mkDerivation, async, base, containers, stm }:
+    ({ mkDerivation, ansi-terminal, async, base, stm }:
      mkDerivation {
        pname = "progress-meter";
-       version = "0.1.0";
-       sha256 = "0xbrs2ydi64vllwz55b100ggwdcixi2p8zxlbxg7hg7s6ki244xf";
-       libraryHaskellDepends = [ async base containers stm ];
+       version = "1.0.0.1";
+       sha256 = "1mdzwbzkf9ja7i21hds26gqn2ll4hnidbcq145yigkfzv93r6hq6";
+       libraryHaskellDepends = [ ansi-terminal async base stm ];
        homepage = "https://github.com/esoeylemez/progress-meter";
        description = "Live diagnostics for concurrent activity";
        license = stdenv.lib.licenses.bsd3;
@@ -159628,6 +160474,19 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "qq-literals" = callPackage
+    ({ mkDerivation, base, network-uri, template-haskell }:
+     mkDerivation {
+       pname = "qq-literals";
+       version = "0.1.0.0";
+       sha256 = "1fsl1639jzik9zrkks1badx6pd303rjdm3dmnb6cfjjb1jg50cqr";
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base network-uri template-haskell ];
+       homepage = "https://github.com/hdgarrood/qq-literals";
+       description = "Compile-time checked literal values via QuasiQuoters";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "qr-imager" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cryptonite, directory
      , either, haskell-qrencode, hspec, jose-jwt, JuicyPixels
@@ -162149,6 +163008,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ratel_0_3_8" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, case-insensitive
+     , containers, filepath, http-client, http-client-tls, http-types
+     , tasty, tasty-hspec, text, uuid
+     }:
+     mkDerivation {
+       pname = "ratel";
+       version = "0.3.8";
+       sha256 = "1zd5dc21y60yjzbwgr8vf099y0rqmdirn1mq6s03jpiyar33lv3b";
+       libraryHaskellDepends = [
+         aeson base bytestring case-insensitive containers http-client
+         http-client-tls http-types text uuid
+       ];
+       testHaskellDepends = [ base filepath tasty tasty-hspec ];
+       homepage = "https://github.com/tfausak/ratel#readme";
+       description = "Notify Honeybadger about exceptions";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ratel-wai" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , http-client, ratel, wai
@@ -162165,6 +163044,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ratel-wai_0_3_2" = callPackage
+    ({ mkDerivation, base, bytestring, case-insensitive, containers
+     , http-client, ratel, wai
+     }:
+     mkDerivation {
+       pname = "ratel-wai";
+       version = "0.3.2";
+       sha256 = "1f38xivw19ic002idr936859rwmz2g9nmhbwxvsf4fw3lm31qwpa";
+       libraryHaskellDepends = [
+         base bytestring case-insensitive containers http-client ratel wai
+       ];
+       homepage = "https://github.com/tfausak/ratel-wai#readme";
+       description = "Notify Honeybadger about exceptions via a WAI middleware";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rating-systems" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -169459,8 +170355,8 @@ self: {
      }:
      mkDerivation {
        pname = "safecopy-store";
-       version = "0.9.5";
-       sha256 = "177v32sn3bxk3a4f4lg9vh4yc1lgylzrwzs0n6k4jrs8jxlz74iw";
+       version = "0.9.6";
+       sha256 = "1x82j4zw26pp38bcx4rnmz7ikpz8nf9mc4pkpcg9c9x76p8kxsfa";
        libraryHaskellDepends = [
          array base bytestring containers old-time store store-core
          template-haskell text time vector
@@ -169679,8 +170575,8 @@ self: {
     ({ mkDerivation, base, doctest }:
      mkDerivation {
        pname = "salve";
-       version = "0.0.9";
-       sha256 = "0x16rdrm8i2jwbi1zd7zj43r3h7jb9fzb33b5nbwkwfh397sm11h";
+       version = "0.0.10";
+       sha256 = "0d31pza3i06bs95ngspkabqrlfqjqmarmfjbpqir2xd1bz3xybjr";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
        homepage = "https://github.com/tfausak/salve#readme";
@@ -171660,6 +172556,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) SDL2_mixer;};
 
+  "sdl2-mixer_1_1_0" = callPackage
+    ({ mkDerivation, base, bytestring, data-default-class, lifted-base
+     , monad-control, sdl2, SDL2_mixer, template-haskell, vector
+     }:
+     mkDerivation {
+       pname = "sdl2-mixer";
+       version = "1.1.0";
+       sha256 = "1k8avyccq5l9z7bwxigim312yaancxl1sr3q6a96bcm7pnhiak0g";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring data-default-class lifted-base monad-control sdl2
+         template-haskell vector
+       ];
+       librarySystemDepends = [ SDL2_mixer ];
+       libraryPkgconfigDepends = [ SDL2_mixer ];
+       description = "Bindings to SDL2_mixer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) SDL2_mixer;};
+
   "sdl2-ttf" = callPackage
     ({ mkDerivation, base, bytestring, SDL2, sdl2, SDL2_ttf
      , template-haskell, text, transformers
@@ -173362,8 +174279,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-token";
-       version = "0.5.0.0";
-       sha256 = "1ivlc7ivn4rn2appxyv2cgn4s812s82d3a8q9ykfy1yhpjygk9hp";
+       version = "0.5.1.0";
+       sha256 = "113pjs52nvi94bfx1ys4lanyvzkrlmb1p2y8sxhhb4bal917xki1";
        libraryHaskellDepends = [
          aeson-injector base bytestring containers http-api-data mtl
          pwstore-fast servant servant-auth-token-api servant-server text
@@ -173384,8 +174301,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-token-acid";
-       version = "0.5.0.0";
-       sha256 = "1hvslg23l43k6wz6z84xcm3sv0lxgnvcsrx7z8493zyav9lnlx6h";
+       version = "0.5.1.0";
+       sha256 = "1kxmgdj7bz2bbs6n9kfp28y9a9cvc2xk8345jnd4ks0iw43xjwr3";
        libraryHaskellDepends = [
          acid-state aeson-injector base bytestring containers ghc-prim
          monad-control mtl safe safecopy servant-auth-token
@@ -173404,8 +174321,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-token-api";
-       version = "0.4.2.2";
-       sha256 = "0dnaqhri1hg1c3gmlpnpyk21q4cq9j513fnd3g1m9k7mkc6h6bgv";
+       version = "0.5.1.0";
+       sha256 = "0kn25ldc774zx8r5hnrd7ibdm4g3769f99g8vl99x0miplpz0v0a";
        libraryHaskellDepends = [
          aeson aeson-injector base lens raw-strings-qq servant servant-docs
          servant-swagger swagger2 text
@@ -173425,8 +174342,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-token-leveldb";
-       version = "0.5.0.0";
-       sha256 = "1v1h9jpc9ypdd6sfcb9w4lhv2ldsnlcpmmsghbdky50vqmq1y8qj";
+       version = "0.5.1.0";
+       sha256 = "0bkprvi9zwc599ynkabjsk1m9wpbvfpmhzjx6rqj92m1nki62264";
        libraryHaskellDepends = [
          aeson-injector base bytestring concurrent-extra containers
          exceptions lens leveldb-haskell monad-control mtl resourcet safe
@@ -173448,8 +174365,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-token-persistent";
-       version = "0.6.0.0";
-       sha256 = "18y9g9pfzbhv35pfcr4973h320p8ify8nf4vllcdv83whfm48bc1";
+       version = "0.6.1.0";
+       sha256 = "1ni74vk121ncfkdjksf15g6686c2acbg22dn1srzwyngx5iwjcnc";
        libraryHaskellDepends = [
          aeson-injector base bytestring containers monad-control mtl
          persistent persistent-template servant-auth-token
@@ -173471,8 +174388,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-token-rocksdb";
-       version = "0.5.0.0";
-       sha256 = "0cr8qgkv89sps6ykv0v1bng2xk4g7r00fjnmgjp58kpc18pvg4vl";
+       version = "0.5.1.0";
+       sha256 = "1xbnqv3b64r1xnzra2pdysjg5r9kxwxaya5rfrcgl8fz1b4n4hbb";
        libraryHaskellDepends = [
          aeson-injector base bytestring concurrent-extra containers
          exceptions lens monad-control mtl resourcet rocksdb-haskell safe
@@ -173951,19 +174868,19 @@ self: {
   "servant-github-webhook" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, bytestring
      , cryptonite, github, http-types, memory, servant, servant-server
-     , string-conversions, text, transformers, wai, warp
+     , string-conversions, text, wai, warp
      }:
      mkDerivation {
        pname = "servant-github-webhook";
-       version = "0.3.1.0";
-       sha256 = "0px2pxw6piqjh2vawf0mkhcf96pqk2rm0izvbsy5xcd011qlvfhq";
+       version = "0.3.2.0";
+       sha256 = "15n6nn03m2gxhd4rhavcxny13q962db3c4fi9gjzix6w56vwqwm7";
        libraryHaskellDepends = [
          aeson base base16-bytestring bytestring cryptonite github
          http-types memory servant servant-server string-conversions text
-         transformers wai
+         wai
        ];
        testHaskellDepends = [
-         aeson base bytestring servant-server transformers wai warp
+         aeson base bytestring servant-server wai warp
        ];
        homepage = "https://github.com/tsani/servant-github-webhook";
        description = "Servant combinators to facilitate writing GitHub webhooks";
@@ -174285,6 +175202,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "servant-proto-lens" = callPackage
+    ({ mkDerivation, async, base, bytestring, data-default-class
+     , http-client, http-media, HUnit, lens, proto-lens
+     , proto-lens-protobuf-types, servant, servant-client
+     , servant-server, test-framework, test-framework-hunit, warp
+     }:
+     mkDerivation {
+       pname = "servant-proto-lens";
+       version = "0.1.0.1";
+       sha256 = "1sa3vkr4vd6lvclscb4ki7ph17pdvq8ka22gmymz0yr760nx398a";
+       libraryHaskellDepends = [
+         base bytestring http-media proto-lens servant
+       ];
+       testHaskellDepends = [
+         async base data-default-class http-client HUnit lens proto-lens
+         proto-lens-protobuf-types servant-client servant-server
+         test-framework test-framework-hunit warp
+       ];
+       homepage = "https://github.com/plredmond/servant-proto-lens";
+       description = "Servant Content-Type for proto-lens protobuf modules";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "servant-purescript" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , filepath, http-types, lens, mainland-pretty, purescript-bridge
@@ -178132,8 +179072,8 @@ self: {
      }:
      mkDerivation {
        pname = "siren-json";
-       version = "0.1.0.2";
-       sha256 = "0jkrqqfl713vpmypm7bkzvv5sia23zjhk0l90slyk4cmcmxn1s1a";
+       version = "0.1.2.0";
+       sha256 = "0rzc7brcq51j3vrlfr59fysig4fgfja3z07rz0pgg82dl8wxp9fk";
        libraryHaskellDepends = [
          aeson base bytestring containers http-media http-types network-uri
          network-uri-json text unordered-containers
@@ -178146,7 +179086,7 @@ self: {
        homepage = "https://github.com/alunduil/siren-json.hs";
        description = "Siren Tools for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ alunduil ];
      }) {};
 
   "sirkel" = callPackage
@@ -178703,6 +179643,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "slate" = callPackage
+    ({ mkDerivation, base, directory, filepath, optparse-applicative }:
+     mkDerivation {
+       pname = "slate";
+       version = "0.3.0.0";
+       sha256 = "0whwsaxxz43ahz3x0l0vhq9m1mw2sxzh26mpxf8wzjka4xdizrwm";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base directory filepath optparse-applicative
+       ];
+       executableHaskellDepends = [
+         base directory filepath optparse-applicative
+       ];
+       testHaskellDepends = [
+         base directory filepath optparse-applicative
+       ];
+       homepage = "https://github.com/evuez/slate#readme";
+       description = "A note taking CLI tool";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "slave-thread" = callPackage
     ({ mkDerivation, base, base-prelude, HTF, list-t, mmorph
      , partial-handler, QuickCheck, quickcheck-instances, SafeSemaphore
@@ -178931,6 +179893,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "smallcheck_1_1_3_1" = callPackage
+    ({ mkDerivation, base, ghc-prim, logict, mtl, pretty }:
+     mkDerivation {
+       pname = "smallcheck";
+       version = "1.1.3.1";
+       sha256 = "1lmx0sxkhryra7laln8m7z0518jshahsvz121xybajjcz9pz3xcz";
+       libraryHaskellDepends = [ base ghc-prim logict mtl pretty ];
+       homepage = "https://github.com/feuerbach/smallcheck";
+       description = "A property-based testing library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "smallcheck-laws" = callPackage
     ({ mkDerivation, base, smallcheck, smallcheck-series }:
      mkDerivation {
@@ -181248,6 +182223,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "socks_0_5_6" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, network }:
+     mkDerivation {
+       pname = "socks";
+       version = "0.5.6";
+       sha256 = "0f44qy74i0n6ll3jym0a2ipafkpw1h67amcpqmj8iq95h21wsqzs";
+       libraryHaskellDepends = [ base bytestring cereal network ];
+       homepage = "http://github.com/vincenthz/hs-socks";
+       description = "Socks proxy (ver 5)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "sodium" = callPackage
     ({ mkDerivation, base, containers, mtl }:
      mkDerivation {
@@ -181759,8 +182747,8 @@ self: {
      }:
      mkDerivation {
        pname = "sparkle";
-       version = "0.7.1";
-       sha256 = "1494c6zwn8q3aj9x07r2iikkbnxf8r3aw823dip47sygc95wy39w";
+       version = "0.7.2.1";
+       sha256 = "1bfgj1a43aj4nwzq1471l2sb9il7sh0czc22fhmd8mhpbz6wlnsp";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -183469,10 +184457,10 @@ self: {
      }:
      mkDerivation {
        pname = "stack";
-       version = "1.6.1";
-       sha256 = "0mf95h83qrgidkfvwm47w262fprsh8g5rf9mzkc1v2ifbn9b93v9";
+       version = "1.6.3";
+       sha256 = "0ylika6qf7agj07wh47xjirhg74l63lx80q0xm41yd9g5ssk9cbj";
        revision = "1";
-       editedCabalFile = "103w999pac6337idj241iil52rssjp4vn5r5bvgl72sn64wxkm4x";
+       editedCabalFile = "0bf0szsf3gq7q41ck3ccyfjy13911nhas6is3id9mx7f47bygpxx";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -184668,13 +185656,11 @@ self: {
     ({ mkDerivation, base, hspec, vector }:
      mkDerivation {
        pname = "stb-image-redux";
-       version = "0.2.1.0";
-       sha256 = "07gbj7qqgm3dwx6bign8qma3a0187p5nil7z612976bdpz9abr60";
-       revision = "2";
-       editedCabalFile = "1ils1w36y3c4ik0mxnadrhxw1fy426av438ckg2fgnzys0i5zqp2";
+       version = "0.2.1.2";
+       sha256 = "1s23f38za0zv9vzj4qn5qq2ajhgr6g9gsd2nck2hmkqfjpw1mx1v";
        libraryHaskellDepends = [ base vector ];
        testHaskellDepends = [ base hspec vector ];
-       homepage = "https://github.com/sasinestro/stb-image-redux#readme";
+       homepage = "https://github.com/typedrat/stb-image-redux#readme";
        description = "Image loading and writing microlibrary";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -186716,6 +187702,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "strive_4_0_3" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline
+     , http-client, http-client-tls, http-types, markdown-unlit
+     , template-haskell, text, time, transformers
+     }:
+     mkDerivation {
+       pname = "strive";
+       version = "4.0.3";
+       sha256 = "1b1shq0jznyx9cbir33diflw1602py651rqj2hfjrgdywjrac8fq";
+       libraryHaskellDepends = [
+         aeson base bytestring data-default gpolyline http-client
+         http-client-tls http-types template-haskell text time transformers
+       ];
+       testHaskellDepends = [ base bytestring markdown-unlit time ];
+       homepage = "https://github.com/tfausak/strive#readme";
+       description = "A client for the Strava V3 API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "strptime" = callPackage
     ({ mkDerivation, base, bytestring, text, time }:
      mkDerivation {
@@ -189765,10 +190771,8 @@ self: {
      }:
      mkDerivation {
        pname = "taggy";
-       version = "0.2.0";
-       sha256 = "01q2ccf3a8akaifh79ajnfr5yrjsq4xihq0pl7lsz173n7mhnsy3";
-       revision = "1";
-       editedCabalFile = "02xmvs9m977szhf5cgy31rbadi662g194giq3djzvsd41c1sshq3";
+       version = "0.2.1";
+       sha256 = "1xmxwg024k5q4ah0pfn6nhyrznskgwg6anw558qzb4k5rjk3b7nq";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -190447,15 +191451,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "tasty_0_12" = callPackage
+  "tasty_0_12_0_1" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, clock, containers
      , deepseq, mtl, optparse-applicative, regex-tdfa, stm, tagged
      , unbounded-delays, unix
      }:
      mkDerivation {
        pname = "tasty";
-       version = "0.12";
-       sha256 = "0840ziawhj0lrzn927nx9lww6wxc5krvf0c3xygl577vvxh4adg1";
+       version = "0.12.0.1";
+       sha256 = "1qxhqb4kbzr2yw091pg3kg5xcn0015xjhi3cx6dl7qgjc7wx20zb";
        libraryHaskellDepends = [
          ansi-terminal async base clock containers deepseq mtl
          optparse-applicative regex-tdfa stm tagged unbounded-delays unix
@@ -190518,6 +191522,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tasty-dejafu_1_0_0_0" = callPackage
+    ({ mkDerivation, base, dejafu, random, tagged, tasty }:
+     mkDerivation {
+       pname = "tasty-dejafu";
+       version = "1.0.0.0";
+       sha256 = "1gybk59c1jcbpmyrddfqs45z026rvfk6idd99shds3qhlfbm4897";
+       libraryHaskellDepends = [ base dejafu random tagged tasty ];
+       homepage = "https://github.com/barrucadu/dejafu";
+       description = "Deja Fu support for the Tasty test framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-discover" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, Glob
      , hedgehog, tasty, tasty-hedgehog, tasty-hspec, tasty-hunit
@@ -190545,6 +191562,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tasty-discover_4_1_2" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath, Glob
+     , hedgehog, tasty, tasty-hedgehog, tasty-hspec, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "tasty-discover";
+       version = "4.1.2";
+       sha256 = "1mblgkilbhq9g00hbi1f07r3z5gh8aj9smyas1b1svd1v38szwkj";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers directory filepath Glob
+       ];
+       executableHaskellDepends = [
+         base containers directory filepath Glob
+       ];
+       testHaskellDepends = [
+         base containers directory filepath Glob hedgehog tasty
+         tasty-hedgehog tasty-hspec tasty-hunit tasty-quickcheck
+         tasty-smallcheck
+       ];
+       homepage = "https://github.com/lwm/tasty-discover#readme";
+       description = "Test discovery for the tasty framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-expected-failure" = callPackage
     ({ mkDerivation, base, tagged, tasty }:
      mkDerivation {
@@ -192841,6 +193886,31 @@ self: {
        license = "GPL";
      }) {};
 
+  "texmath_0_10_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory, filepath
+     , mtl, network-uri, pandoc-types, parsec, process, split, syb
+     , temporary, text, utf8-string, xml
+     }:
+     mkDerivation {
+       pname = "texmath";
+       version = "0.10.1";
+       sha256 = "04qygn60f7920vm1f2xkf686kaimng8k030xlp3iy2hbgs33sxbj";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers mtl pandoc-types parsec syb xml
+       ];
+       executableHaskellDepends = [ network-uri ];
+       testHaskellDepends = [
+         base bytestring directory filepath process split temporary text
+         utf8-string xml
+       ];
+       homepage = "http://github.com/jgm/texmath";
+       description = "Conversion between formats used to represent mathematics";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "texrunner" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, directory, filepath
      , HUnit, io-streams, lens, mtl, process, temporary, test-framework
@@ -193197,6 +194267,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "text-ldap_0_1_1_10" = callPackage
+    ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring
+     , containers, dlist, QuickCheck, quickcheck-simple, random
+     , transformers
+     }:
+     mkDerivation {
+       pname = "text-ldap";
+       version = "0.1.1.10";
+       sha256 = "13wjarsshp64cc632bqmckx664a57w7cnlm8gs7rfp1bcm7vdnjk";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base base64-bytestring bytestring containers dlist
+         transformers
+       ];
+       executableHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [
+         base bytestring QuickCheck quickcheck-simple random
+       ];
+       description = "Parser and Printer for LDAP text data stream";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "text-lens" = callPackage
     ({ mkDerivation, base, extra, hspec, lens, text }:
      mkDerivation {
@@ -199474,6 +200568,40 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "twitter-conduit_0_2_3" = callPackage
+    ({ mkDerivation, aeson, attoparsec, authenticate-oauth, base
+     , bytestring, Cabal, cabal-doctest, case-insensitive, conduit
+     , conduit-extra, containers, data-default, doctest, exceptions
+     , hlint, hspec, http-client, http-conduit, http-types, lens
+     , lens-aeson, network-uri, resourcet, template-haskell, text, time
+     , transformers, transformers-base, twitter-types
+     , twitter-types-lens
+     }:
+     mkDerivation {
+       pname = "twitter-conduit";
+       version = "0.2.3";
+       sha256 = "1xspyig287y2x9y0f6390jd8zmzc2nf2zcsnjd9y69a1qjchviv9";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         aeson attoparsec authenticate-oauth base bytestring conduit
+         conduit-extra containers data-default exceptions http-client
+         http-conduit http-types lens lens-aeson resourcet template-haskell
+         text time transformers transformers-base twitter-types
+         twitter-types-lens
+       ];
+       testHaskellDepends = [
+         aeson attoparsec authenticate-oauth base bytestring
+         case-insensitive conduit conduit-extra containers data-default
+         doctest hlint hspec http-client http-conduit http-types lens
+         lens-aeson network-uri resourcet template-haskell text time
+         twitter-types twitter-types-lens
+       ];
+       homepage = "https://github.com/himura/twitter-conduit";
+       description = "Twitter API package with conduit interface and Streaming API support";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "twitter-enumerator" = callPackage
     ({ mkDerivation, aeson, attoparsec, attoparsec-enumerator
      , authenticate, base, bytestring, containers, enumerator
@@ -200962,6 +202090,8 @@ self: {
        pname = "uhc-util";
        version = "0.1.6.7";
        sha256 = "0xaa9xp7yaj6mjq392x2jyi6rdplfabmhbwwq4ammr4wbqbjfjyl";
+       revision = "1";
+       editedCabalFile = "0ngrfb87vq5r114nlkbkkrzpa6hy6cyws3z1zf339aaixb8g1763";
        libraryHaskellDepends = [
          array base binary bytestring containers directory fclabels fgl
          hashable logict-state mtl pqueue process time time-compat
@@ -202861,6 +203991,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "uri-bytestring_0_3_1_0" = callPackage
+    ({ mkDerivation, attoparsec, base, base-compat, blaze-builder
+     , bytestring, containers, criterion, deepseq, deepseq-generics
+     , fail, generics-sop, HUnit, network-uri, QuickCheck
+     , quickcheck-instances, semigroups, tasty, tasty-hunit
+     , tasty-quickcheck, template-haskell, th-lift-instances
+     , transformers
+     }:
+     mkDerivation {
+       pname = "uri-bytestring";
+       version = "0.3.1.0";
+       sha256 = "04qjv1sgyrdg538290p9hqnvyxnahvr5cjwl8vm1rn9j0fv3ymq9";
+       libraryHaskellDepends = [
+         attoparsec base blaze-builder bytestring containers fail
+         template-haskell th-lift-instances
+       ];
+       testHaskellDepends = [
+         attoparsec base base-compat blaze-builder bytestring containers
+         generics-sop HUnit QuickCheck quickcheck-instances semigroups tasty
+         tasty-hunit tasty-quickcheck transformers
+       ];
+       benchmarkHaskellDepends = [
+         base blaze-builder bytestring criterion deepseq deepseq-generics
+         network-uri
+       ];
+       homepage = "https://github.com/Soostone/uri-bytestring";
+       description = "Haskell URI parsing as ByteStrings";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "uri-bytestring-aeson" = callPackage
     ({ mkDerivation, aeson, base, bytestring, text, uri-bytestring }:
      mkDerivation {
@@ -203457,8 +204618,8 @@ self: {
        pname = "utf8-string";
        version = "1.0.1.1";
        sha256 = "0h7imvxkahiy8pzr8cpsimifdfvv18lizrb33k6mnq70rcx9w2zv";
-       revision = "2";
-       editedCabalFile = "1b97s9picjl689hcz8scinv7c8k5iaal1livqr0l1l8yc4h0imhr";
+       revision = "3";
+       editedCabalFile = "02vhj5gykkqa2dyn7s6gn8is1b5fdn9xcqqvlls268g7cpv6rk38";
        libraryHaskellDepends = [ base bytestring ];
        homepage = "http://github.com/glguy/utf8-string/";
        description = "Support for reading and writing UTF8 Strings";
@@ -203824,8 +204985,8 @@ self: {
     ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
        pname = "uulib";
-       version = "0.9.22";
-       sha256 = "1b9in4xbyi518iix5ln765z99q8prdw6p6lx5dz3ckl36dfs3l6d";
+       version = "0.9.23";
+       sha256 = "1v9gwy1zdkyc8f36n52p127gz1r95ykaqklshg0abiai4xnr1yy6";
        libraryHaskellDepends = [ base ghc-prim ];
        homepage = "https://github.com/UU-ComputerScience/uulib";
        description = "Haskell Utrecht Tools Library";
@@ -210143,8 +211304,8 @@ self: {
      }:
      mkDerivation {
        pname = "wolf";
-       version = "0.3.37";
-       sha256 = "09ry5bq0hmrdv09hd9v16r4dyyyfzpf785sfrz3by6hal8bkwj6w";
+       version = "0.3.38";
+       sha256 = "1csd52wflvxv8iaaflw44wxr6ycmrf1k5d1r5yv9c7skswarnmk3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -211076,6 +212237,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wuss_1_1_6" = callPackage
+    ({ mkDerivation, base, bytestring, connection, network, websockets
+     }:
+     mkDerivation {
+       pname = "wuss";
+       version = "1.1.6";
+       sha256 = "1g2k48mngg8fr6cvkimjr39jc83b87lva0320bwdnf19nyz1fy9y";
+       libraryHaskellDepends = [
+         base bytestring connection network websockets
+       ];
+       homepage = "https://github.com/tfausak/wuss#readme";
+       description = "Secure WebSocket (WSS) clients";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wx" = callPackage
     ({ mkDerivation, base, stm, time, wxcore }:
      mkDerivation {
@@ -214487,8 +215664,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth-hmac-keccak";
-       version = "0.0.0.3";
-       sha256 = "1x5qnhdhy0n6kf9gljkig2q4dsfay1rv8gg3xc5ly5dvbbmy4zp8";
+       version = "0.0.0.4";
+       sha256 = "17i3xxxdpq58q7y80xrh266lzkl8dh686v25kpapn2r0c4vxm291";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring cryptonite mtl persistent random shakespeare
@@ -217352,22 +218529,22 @@ self: {
      }) {};
 
   "zifter" = callPackage
-    ({ mkDerivation, ansi-terminal, async, base, directory, exceptions
-     , filepath, genvalidity, genvalidity-hspec, genvalidity-path, hspec
-     , optparse-applicative, path, path-io, process, QuickCheck, safe
-     , stm, validity, validity-path
+    ({ mkDerivation, ansi-terminal, async, base, colour, directory
+     , exceptions, filepath, genvalidity, genvalidity-hspec
+     , genvalidity-path, hspec, optparse-applicative, path, path-io
+     , process, QuickCheck, safe, stm, validity, validity-path
      }:
      mkDerivation {
        pname = "zifter";
-       version = "0.0.1.3";
-       sha256 = "0hams2ayxm73p2m032vjxnrdpg7d8iz293sx29h011siv1xjyaab";
+       version = "0.0.1.5";
+       sha256 = "06bnj0zxxmspzw5rpc53hxksdd1h9nd6viwrvfmgj1fam1fhh856";
        libraryHaskellDepends = [
          ansi-terminal async base directory exceptions filepath
          optparse-applicative path path-io process safe stm validity
          validity-path
        ];
        testHaskellDepends = [
-         ansi-terminal base directory genvalidity genvalidity-hspec
+         ansi-terminal base colour directory genvalidity genvalidity-hspec
          genvalidity-path hspec path path-io QuickCheck stm
        ];
        homepage = "http://cs-syd.eu";
@@ -217382,8 +218559,8 @@ self: {
      }:
      mkDerivation {
        pname = "zifter-cabal";
-       version = "0.0.0.2";
-       sha256 = "009vhy3x5hb24n1ylr31hvgfk2bic1r9yy8nk78ym1yhjb4vrrj5";
+       version = "0.0.0.3";
+       sha256 = "04nwyma5p6ka86zh2hczli4842l5hg6kvhsv3bwwf722bkhzdznq";
        libraryHaskellDepends = [
          base directory filepath path path-io process safe zifter
        ];
@@ -217397,8 +218574,8 @@ self: {
     ({ mkDerivation, base, path, process, zifter }:
      mkDerivation {
        pname = "zifter-git";
-       version = "0.0.0.0";
-       sha256 = "0mq5aa7nljbdgimvs948kzn16m74771jyswbk0fq6jqyrb80li4j";
+       version = "0.0.0.1";
+       sha256 = "1fsrair0c0a6j2jmghcxvbs3dr6j7gzh3yfimflva64nvwfx8vb8";
        libraryHaskellDepends = [ base path process zifter ];
        homepage = "http://cs-syd.eu";
        description = "zifter-git";
@@ -217412,8 +218589,8 @@ self: {
      }:
      mkDerivation {
        pname = "zifter-google-java-format";
-       version = "0.0.0.0";
-       sha256 = "0kl3mgg4hbzl9ifd8x30nnczrygs5ziqhmz47l5nzx40ja177546";
+       version = "0.0.0.1";
+       sha256 = "00am6djnk7ivb9cd5v59axlbi3da70m2fzfghmzq6dgvlkghng0c";
        libraryHaskellDepends = [
          base filepath path path-io process safe zifter
        ];
@@ -217429,8 +218606,8 @@ self: {
      }:
      mkDerivation {
        pname = "zifter-hindent";
-       version = "0.0.0.1";
-       sha256 = "10qwlvw1zq5q530xlh69ag9ap4jl5gv5xj7sc4bwjglbbcw39iag";
+       version = "0.0.0.2";
+       sha256 = "106iv5gqqlmvdjs1z4n7p3m11c36x4531395fpxh5sfzc8mrhgg2";
        libraryHaskellDepends = [
          base directory filepath path path-io process safe zifter
        ];
@@ -217445,10 +218622,8 @@ self: {
      }:
      mkDerivation {
        pname = "zifter-hlint";
-       version = "0.0.0.0";
-       sha256 = "0bvp6l5k42ls996h3qc7wy4qgcx0phd8hf0l99kcqan2gpx8qn6p";
-       revision = "1";
-       editedCabalFile = "08wmzid4g3av9w86ysybvg2mwkfx63b19v2i71hvik48bl5v6mlv";
+       version = "0.0.0.1";
+       sha256 = "1303crjb500psmsnc3ivy67qgz5gdbd3dsfnf3qis39amxmw1wf4";
        libraryHaskellDepends = [
          base filepath hlint path path-io safe zifter
        ];
@@ -217464,8 +218639,8 @@ self: {
      }:
      mkDerivation {
        pname = "zifter-stack";
-       version = "0.0.0.6";
-       sha256 = "0z2y77fd9ij8s9qqyjik1syh5ry169bda6wlsa4lj658f8yghggc";
+       version = "0.0.0.8";
+       sha256 = "03grslbsd7x1gj6fw80vsmj2cyfvrfmlqqzcrx3j2rk0icax0nla";
        libraryHaskellDepends = [
          base Cabal directory filepath path path-io process safe zifter
        ];
diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index ffb0974e0522..c854f880ab94 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 import ./generic.nix (args // rec {
-  version = "4.14.8";
+  version = "4.14.9";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
@@ -13,6 +13,6 @@ import ./generic.nix (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0cwk9liv79hw5l34xvwnf05spx1jvv8q8w9lfbw4lw8xldxwbg3f";
+    sha256 = "1vqllh36wss4dsdvb12zchy6hjaniyxcla5cg8962xrkim2bpk6g";
   };
 } // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index ef3265c7c303..f45841d0284c 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.71";
+  version = "4.9.72";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "173nvdshckhdlisn08pf6cal9bhlj8ra569y26013hsfzd09gzgi";
+    sha256 = "0fxqfqcqn6rk6rxzmy8r3vgzvy9xlnb3hvg2rniykbcyxgqh3wk9";
   };
 } // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 9124559ef7a0..355fbde62680 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -234,7 +234,7 @@ let
     };
 in
 
-assert stdenv.lib.versionAtLeast version "4.15" -> libelf != null;
+assert stdenv.lib.versionAtLeast version "4.14" -> libelf != null;
 assert stdenv.lib.versionAtLeast version "4.15" -> utillinux != null;
 stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKernelPatches) configfile) // {
   name = "linux-${version}";
@@ -243,7 +243,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKe
 
   nativeBuildInputs = [ perl bc nettools openssl gmp libmpc mpfr ]
       ++ optional (stdenv.platform.kernelTarget == "uImage") ubootTools
-      ++ optional (stdenv.lib.versionAtLeast version "4.15") libelf
+      ++ optional (stdenv.lib.versionAtLeast version "4.14") libelf
       ++ optional (stdenv.lib.versionAtLeast version "4.15") utillinux
       ;
 
diff --git a/pkgs/tools/filesystems/sshfs-fuse/build-man-pages.patch b/pkgs/tools/filesystems/sshfs-fuse/build-man-pages.patch
deleted file mode 100644
index fba1d250c42b..000000000000
--- a/pkgs/tools/filesystems/sshfs-fuse/build-man-pages.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/meson.build	2017-09-23 22:02:57.770555382 +0200
-+++ b/meson.build	2017-09-23 23:11:28.258095182 +0200
-@@ -25,7 +25,7 @@
- endif
- 
- 
--rst2man = find_program('rst2man', required: false)
-+rst2man = find_program('rst2man.py', required: true)
-   
- cfg = configuration_data()
- 
diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix
index eebe3076c98a..6fd55c369d59 100644
--- a/pkgs/tools/filesystems/sshfs-fuse/default.nix
+++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, meson, pkgconfig, ninja, glib, fuse3
-, buildManPages ? true, docutils
+, docutils
 }:
 
 let
@@ -15,10 +15,8 @@ in stdenv.mkDerivation rec {
     sha256 = "15z1mlad09llckkadvjfzmbv14fbq218xmb4axkmi7kzixbi41hv";
   };
 
-  patches = optional buildManPages ./build-man-pages.patch;
-
-  nativeBuildInputs = [ meson pkgconfig ninja ];
-  buildInputs = [ fuse3 glib ] ++ optional buildManPages docutils;
+  nativeBuildInputs = [ meson pkgconfig ninja docutils ];
+  buildInputs = [ fuse3 glib ];
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optional
     (stdenv.system == "i686-linux")
diff --git a/pkgs/tools/misc/fsmon/default.nix b/pkgs/tools/misc/fsmon/default.nix
index d3a1a7124669..f9e40b6b7867 100644
--- a/pkgs/tools/misc/fsmon/default.nix
+++ b/pkgs/tools/misc/fsmon/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "fsmon-${version}";
-  version = "1.4";
+  version = "1.5";
 
   src = fetchFromGitHub {
     owner = "nowsecure";
     repo = "fsmon";
     rev = "${version}";
-    sha256 = "0sqld41jn142d4zbqmylzrnx1km7xs6r8dnmf453gyhi3yzdbr1j";
+    sha256 = "1b99cd5k2zh30sagp3f55jvj1r48scxibv7aqqc2sp82sci59npg";
   };
 
   installPhase = ''
diff --git a/pkgs/tools/misc/picocom/default.nix b/pkgs/tools/misc/picocom/default.nix
index bfafe0151a0a..dfd81bd97423 100644
--- a/pkgs/tools/misc/picocom/default.nix
+++ b/pkgs/tools/misc/picocom/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "picocom-${version}";
-  version = "2.2";
+  version = "3.0";
 
   src = fetchFromGitHub {
     owner = "npat-efault";
     repo = "picocom";
     rev = version;
-    sha256 = "06b2ic34dnxc73cprc5imi3iamlhsv623sbg9vj5h5rvs586dwjx";
+    sha256 = "1i75ksm44la8kn82v71hzq0q5642y108rascdb94zilhagdhilk2";
   };
 
   buildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/networking/quicktun/default.nix b/pkgs/tools/networking/quicktun/default.nix
index 6332d6c85774..ceee8cca1aae 100644
--- a/pkgs/tools/networking/quicktun/default.nix
+++ b/pkgs/tools/networking/quicktun/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "1ydvwasj84qljfbzh6lmhyzjc20yw24a0v2mykp8afsm97zzlqgx";
   };
 
+  patches = [ ./tar-1.30.diff ]; # quicktun master seems not to need this
+
   buildInputs = [ libsodium ];
 
   buildPhase = "bash build.sh";
diff --git a/pkgs/tools/networking/quicktun/tar-1.30.diff b/pkgs/tools/networking/quicktun/tar-1.30.diff
new file mode 100644
index 000000000000..88498e542807
--- /dev/null
+++ b/pkgs/tools/networking/quicktun/tar-1.30.diff
@@ -0,0 +1,19 @@
+Fix build with gnutar-1.30
+
+Creating source archive...
+tar: The following options were used after any non-optional arguments in archive create or update mode.  These options are positional and affect only arguments that follow them.  Please, rearrange them properly.
+tar: --exclude 'debian/data' has no effect
+tar: Exiting with failure status due to previous errors
+diff --git a/build.sh b/build.sh
+index 0ea0403..725178c 100755
+--- a/build.sh
++++ b/build.sh
+@@ -25,7 +25,7 @@ rm -rf out/ obj/ tmp/
+ mkdir -p out
+ if [ "$1" != "debian" ]; then
+ 	echo Creating source archive...
+-	$tar --transform "s,^,quicktun-`cat version`/," -czf "out/quicktun-`cat version`.tgz" build.sh clean.sh debian src version --exclude "debian/data"
++	$tar --transform "s,^,quicktun-`cat version`/," -czf "out/quicktun-`cat version`.tgz" --exclude "debian/data" build.sh clean.sh debian src version
+ fi
+ 
+ mkdir -p obj tmp tmp/include tmp/lib
diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix
index 963c383b66e9..89fb5f05ac97 100644
--- a/pkgs/tools/system/fio/default.nix
+++ b/pkgs/tools/system/fio/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, libaio, python, zlib }:
 
 let
-  version = "3.2";
-  sha256 = "1sp83lxhrwg4627bma3pkcfg8yd1w3r6p02rdldv083962ljkinm";
+  version = "3.3";
+  sha256 = "0ipdpdn6rlsbppqjddyyk8c6rg1dl17d62dwwm0ijybi0m7imy1p";
 in
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 37d764205099..6eb826c073f6 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -79,7 +79,7 @@ mapAliases (rec {
   htmlTidy = html-tidy;  # added 2014-12-06
   iana_etc = iana-etc;  # added 2017-03-08
   idea = jetbrains; # added 2017-04-03
-  inherit (haskell.compiler) jhc uhc;   # 2015-05-15
+  inherit (haskell.compiler) uhc;   # 2015-05-15
   inotifyTools = inotify-tools;
   joseki = apache-jena-fuseki; # added 2016-02-28
   jquery_ui = jquery-ui;  # added 2014-09-07
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 661c6d8bf76d..e980db5cc705 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -13,7 +13,6 @@ let
     "ghcjs"
     "ghcjsHEAD"
     "ghcCross"
-    "jhc"
     "uhc"
     "integer-simple"
   ];
@@ -58,10 +57,6 @@ in rec {
     ghc784 = callPackage ../development/compilers/ghc/7.8.4.nix {
       ghc = compiler.ghc742Binary;
     };
-    ghc7102 = callPackage ../development/compilers/ghc/7.10.2.nix rec {
-      bootPkgs = packages.ghc784;
-      inherit (bootPkgs) hscolour;
-    };
     ghc7103 = callPackage ../development/compilers/ghc/7.10.3.nix rec {
       bootPkgs = packages.ghc784;
       inherit (bootPkgs) hscolour;
@@ -95,10 +90,6 @@ in rec {
       inherit (bootPkgs) hscolour alex happy;
     };
 
-    jhc = callPackage ../development/compilers/jhc {
-      inherit (packages.ghc763) ghcWithPackages;
-    };
-
     uhc = callPackage ../development/compilers/uhc/default.nix ({
       stdenv = pkgs.clangStdenv;
       inherit (pkgs.haskellPackages) ghcWithPackages;
@@ -120,40 +111,10 @@ in rec {
 
   packages = {
 
-    # Support for this compiler is broken, because it can't deal with directory-based package databases.
-    # ghc6104 = callPackage ../development/haskell-modules { ghc = compiler.ghc6104; };
-    ghc6123 = callPackage ../development/haskell-modules {
-      ghc = compiler.ghc6123;
-      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-6.12.x.nix { };
-    };
-    ghc704 = callPackage ../development/haskell-modules {
-      ghc = compiler.ghc704;
-      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.0.x.nix { };
-    };
-    ghc722 = callPackage ../development/haskell-modules {
-      ghc = compiler.ghc722;
-      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.2.x.nix { };
-    };
-    ghc742 = callPackage ../development/haskell-modules {
-      ghc = compiler.ghc742;
-      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.4.x.nix { };
-    };
-    ghc763 = callPackage ../development/haskell-modules {
-      ghc = compiler.ghc763;
-      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.6.x.nix { };
-    };
-    ghc783 = callPackage ../development/haskell-modules {
-      ghc = compiler.ghc783;
-      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.8.x.nix { };
-    };
     ghc784 = callPackage ../development/haskell-modules {
       ghc = compiler.ghc784;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.8.x.nix { };
     };
-    ghc7102 = callPackage ../development/haskell-modules {
-      ghc = compiler.ghc7102;
-      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };
-    };
     ghc7103 = callPackage ../development/haskell-modules {
       ghc = compiler.ghc7103;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d1bcd7a2cb1c..f5dfcffaa269 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7905,15 +7905,25 @@ in {
 
   docutils = buildPythonPackage rec {
     name = "docutils-${version}";
-    version = "0.13.1";
+    version = "0.14";
 
     src = pkgs.fetchurl {
       url = "mirror://sourceforge/docutils/${name}.tar.gz";
-      sha256 = "1gkma47i609jfs7dssxn4y9vsz06qi0l5q41nws0zgkpnrghz33i";
+      sha256 = "0x22fs3pdmr42kvz6c654756wja305qv6cx1zbhwlagvxgr4xrji";
     };
 
-    # error: invalid command 'test'
-    doCheck = false;
+    checkPhase = if isPy3k then ''
+      ${python.interpreter} test3/alltests.py
+    '' else ''
+      ${python.interpreter} test/alltests.py
+    '';
+
+    # Create symlinks lacking a ".py" suffix, many programs depend on these names
+    postFixup = ''
+      (cd $out/bin && for f in *.py; do
+        ln -s $f $(echo $f | sed -e 's/\.py$//')
+      done)
+    '';
 
     meta = {
       description = "An open-source text processing system for processing plaintext documentation into useful formats, such as HTML or LaTeX";