Merge branch 'staging-next' into staging

author: Vladimír Čunát <vcunat@gmail.com> 2019-02-01 09:42:53 +0100
committer: Vladimír Čunát <vcunat@gmail.com> 2019-02-01 09:42:53 +0100
commit: 8ba516664bf367889b06b06e4122372f82f24feb (patch)
tree: 01b691a7e1ad4797843b4c93d8a9d74fd16311d7 /pkgs/development
parent: d00ca4476cd91bae052e8ded4d94e124a353d091 (diff)
parent: 5effa4e0f98b317fe4607b1a6548811017c3325d (diff)
download: nixpkgs-8ba516664bf367889b06b06e4122372f82f24feb.tar
nixpkgs-8ba516664bf367889b06b06e4122372f82f24feb.tar.gz
nixpkgs-8ba516664bf367889b06b06e4122372f82f24feb.tar.bz2
nixpkgs-8ba516664bf367889b06b06e4122372f82f24feb.tar.lz
nixpkgs-8ba516664bf367889b06b06e4122372f82f24feb.tar.xz
nixpkgs-8ba516664bf367889b06b06e4122372f82f24feb.tar.zst
nixpkgs-8ba516664bf367889b06b06e4122372f82f24feb.zip
229 files changed, 3965 insertions, 2700 deletions
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
index 8c6db5ecd8c..6e3fe6c4ebf 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
@@ -48,8 +48,10 @@ in
 
 let result = stdenv.mkDerivation rec {
   name = if sourcePerArch.packageType == "jdk"
-    then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}"
-    else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}";
+    then "adoptopenjdk-${sourcePerArch.vmType}-bin-${version}"
+    else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${version}";
+
+  version = sourcePerArch.${cpuName}.version or (throw "unsupported CPU ${cpuName}");
 
   src = fetchurl {
     inherit (sourcePerArch.${cpuName}) url sha256;
diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix
index 42214ee22dc..5c4d276ab97 100644
--- a/pkgs/development/compilers/closure/default.nix
+++ b/pkgs/development/compilers/closure/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "closure-compiler-${version}";
-  version = "20181210";
+  version = "20190121";
 
   src = fetchurl {
     url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz";
-    sha256 = "0c79ki4lacfwks5f2q7kzcg6v3a65zs5srm14k09gh5k1hvvnayd";
+    sha256 = "1jxxj3a1pbf7bbqs0rkqk28ii1r3w2va4iis8fffx8zfvbgncwyc";
   };
 
   sourceRoot = ".";
diff --git a/pkgs/development/compilers/dotnet/sdk/default.nix b/pkgs/development/compilers/dotnet/sdk/default.nix
index 9970fd9b33d..4e8ab34b101 100644
--- a/pkgs/development/compilers/dotnet/sdk/default.nix
+++ b/pkgs/development/compilers/dotnet/sdk/default.nix
@@ -12,14 +12,14 @@ let
   rpath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc libunwind libuuid icu openssl zlib curl ];
 in
   stdenv.mkDerivation rec {
-    version = "2.1.403";
-    netCoreVersion = "2.1.5";
+    version = "2.2.103";
+    netCoreVersion = "2.2.1";
     name = "dotnet-sdk-${version}";
 
     src = fetchurl {
       url = "https://dotnetcli.azureedge.net/dotnet/Sdk/${version}/dotnet-sdk-${version}-linux-x64.tar.gz";
       # use sha512 from the download page
-      sha512 = "903a8a633aea9211ba36232a2decb3b34a59bb62bc145a0e7a90ca46dd37bb6c2da02bcbe2c50c17e08cdff8e48605c0f990786faf1f06be1ea4a4d373beb8a9";
+      sha512 = "777AC6DCD0200BA447392E451A1779F0FBFA548BD620A7BBA3EEBDF35892236C3F10B19FF81D4F64B5BC134923CB47F9CC45EE6B004140E1249582249944DB69";
     };
 
     unpackPhase = ''
diff --git a/pkgs/development/compilers/gambit/bootstrap.nix b/pkgs/development/compilers/gambit/bootstrap.nix
index 8e9525e3384..aae7c61c6f9 100644
--- a/pkgs/development/compilers/gambit/bootstrap.nix
+++ b/pkgs/development/compilers/gambit/bootstrap.nix
@@ -2,15 +2,15 @@
 
 stdenv.mkDerivation rec {
   name    = "gambit-bootstrap-${version}";
-  version = "4.9.1";
-  tarball_version = "v4_9_1";
+  version = "4.9.2";
+  tarball_version = "v4_9_2";
 
   src = fetchurl {
-    url    = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.9/source/gambit-${tarball_version}-devel.tgz";
-    sha256 = "10kzv568gimp9nzh5xw0h01vw50wi68z3awfp9ibqrpq2l0n7mw7";
+    url    = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.9/source/gambit-${tarball_version}.tgz";
+    sha256 = "1cpganh3jgjdw6qsapcbwxdbp1xwgx5gvdl4ymwf8p2c5k018dwy";
   };
 
-  buildInputs = [ autoconf git ];
+  buildInputs = [ autoconf ];
 
   configurePhase = ''
     ./configure --prefix=$out
diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix
index 19297a6e68e..275d4785a2c 100644
--- a/pkgs/development/compilers/gambit/default.nix
+++ b/pkgs/development/compilers/gambit/default.nix
@@ -1,10 +1,10 @@
 { stdenv, callPackage, fetchurl }:
 
 callPackage ./build.nix {
-  version = "4.9.1";
+  version = "4.9.2";
   src = fetchurl {
-    url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.9/source/gambit-v4_9_1-devel.tgz";
-    sha256 = "10kzv568gimp9nzh5xw0h01vw50wi68z3awfp9ibqrpq2l0n7mw7";
+    url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.9/source/gambit-v4_9_2-devel.tgz";
+    sha256 = "1xpjm3m1pxwj3n0g36lbb3p6wx2nc1iry95xc22pnq3m2374gjxv";
   };
   inherit stdenv;
 }
diff --git a/pkgs/development/compilers/gambit/unstable.nix b/pkgs/development/compilers/gambit/unstable.nix
index 15db82fc9fb..a907de01740 100644
--- a/pkgs/development/compilers/gambit/unstable.nix
+++ b/pkgs/development/compilers/gambit/unstable.nix
@@ -1,13 +1,13 @@
 { stdenv, callPackage, fetchFromGitHub }:
 
 callPackage ./build.nix {
-  version = "unstable-2018-11-19";
-# git-version = "4.9.1-8-g61c6cb50";
+  version = "unstable-2019-01-18";
+# git-version = "4.9.2";
   src = fetchFromGitHub {
     owner = "feeley";
     repo = "gambit";
-    rev = "61c6cb500f4756be1e52095d5ab4501752525a70";
-    sha256 = "1knpb40y1g09c6yqd2fsxm3bk56bl5xrrwfsd7nqa497x6ngm5pn";
+    rev = "cf5688ecf35d85b9355c645f535c1e057b3064e7";
+    sha256 = "1xr7j4iws6hlrdbvlii4n98apr78k4adbnmy4ggzyik65bynh1kl";
   };
   inherit stdenv;
 }
diff --git a/pkgs/development/compilers/gcc/libstdc++-hook.sh b/pkgs/development/compilers/gcc/libstdc++-hook.sh
index 8b1d5d2da67..19db70597ce 100644
--- a/pkgs/development/compilers/gcc/libstdc++-hook.sh
+++ b/pkgs/development/compilers/gcc/libstdc++-hook.sh
@@ -2,4 +2,3 @@
 getHostRole
 
 export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem $(echo -n @gcc@/include/c++/*) -isystem $(echo -n @gcc@/include/c++/*)/$(@gcc@/bin/gcc -dumpmachine)"
-export NIX_${role_pre}CXXSTDLIB_LINK=" -stdlib=libstdc++"
diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix
index 7ebd3f69cbf..b20d6f9c47e 100644
--- a/pkgs/development/compilers/gerbil/build.nix
+++ b/pkgs/development/compilers/gerbil/build.nix
@@ -24,9 +24,13 @@ stdenv.mkDerivation rec {
 
     patchShebangs .
 
-    find . -type f -executable -print0 | while IFS= read -r -d ''$'\0' f; do
+    grep -Fl '#!/usr/bin/env' `find . -type f -executable` | while read f ; do
       substituteInPlace "$f" --replace '#!/usr/bin/env' '#!${coreutils}/bin/env'
     done
+    grep -Fl '"gsc"' `find . -type f -name '*.s*'` | while read f ; do
+      substituteInPlace "$f" --replace '"gsc"' '"${gambit}/bin/gsc"'
+    done
+    substituteInPlace "etc/gerbil.el" --replace '"gxc"' "\"$out/bin/gxc\""
 
     cat > etc/gerbil_static_libraries.sh <<EOF
 #OPENSSL_LIBCRYPTO=${makeStaticLibraries openssl}/lib/libcrypto.a # MISSING!
diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix
index b3d47948364..d2740354e92 100644
--- a/pkgs/development/compilers/gerbil/default.nix
+++ b/pkgs/development/compilers/gerbil/default.nix
@@ -1,14 +1,14 @@
 { stdenv, callPackage, fetchFromGitHub, gambit }:
 
 callPackage ./build.nix rec {
-  version = "0.14";
-  git-version = "0.14";
+  version = "0.15";
+  git-version = "0.15";
   inherit gambit;
   src = fetchFromGitHub {
     owner = "vyzo";
     repo = "gerbil";
     rev = "v${version}";
-    sha256 = "0n078lkf8m391kr99ipb1v2dpi5vkikz9nj0p7kfjg43868my3v7";
+    sha256 = "1ff1gpl0bl1pbs68bxax82ikw4bzbkrj4a6l775ziwyfndjggl66";
   };
   inherit stdenv;
 }
diff --git a/pkgs/development/compilers/gerbil/unstable.nix b/pkgs/development/compilers/gerbil/unstable.nix
index 96bd86b2616..b96ff53b56c 100644
--- a/pkgs/development/compilers/gerbil/unstable.nix
+++ b/pkgs/development/compilers/gerbil/unstable.nix
@@ -1,14 +1,14 @@
 { stdenv, callPackage, fetchFromGitHub, gambit-unstable }:
 
 callPackage ./build.nix {
-  version = "unstable-2018-11-19";
-  git-version = "0.15-DEV-2-g7d09a4ce";
+  version = "unstable-2019-01-25";
+  git-version = "0.15";
   gambit = gambit-unstable;
   src = fetchFromGitHub {
     owner = "vyzo";
     repo = "gerbil";
-    rev = "7d09a4cebe03d755a1791e77279e156a74e07685";
-    sha256 = "1mqi9xcjk59sqbh1fx65a4fa4mqm35py4xqxq6086bcyhkm1nzwa";
+    rev = "8c1aa2ca129a380de9cf668a7f3f6d56e56cbf94";
+    sha256 = "1ff1gpl0bl1pbs68bxax82ikw4bzbkrj4a6l775ziwyfndjggl66";
   };
   inherit stdenv;
 }
diff --git a/pkgs/development/compilers/ghc/8.6.3-binary.nix b/pkgs/development/compilers/ghc/8.6.3-binary.nix
new file mode 100644
index 00000000000..cde67183ef4
--- /dev/null
+++ b/pkgs/development/compilers/ghc/8.6.3-binary.nix
@@ -0,0 +1,164 @@
+{ stdenv
+, fetchurl, perl, gcc, llvm_39
+, ncurses5, gmp, glibc, libiconv
+}:
+
+# Prebuilt only does native
+assert stdenv.targetPlatform == stdenv.hostPlatform;
+
+let
+  libPath = stdenv.lib.makeLibraryPath ([
+    ncurses5 gmp
+  ] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv);
+
+  libEnvVar = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "DY"
+    + "LD_LIBRARY_PATH";
+
+  glibcDynLinker = assert stdenv.isLinux;
+    if stdenv.hostPlatform.libc == "glibc" then
+       # Could be stdenv.cc.bintools.dynamicLinker, keeping as-is to avoid rebuild.
+       ''"$(cat $NIX_CC/nix-support/dynamic-linker)"''
+    else
+      "${stdenv.lib.getLib glibc}/lib/ld-linux*";
+
+in
+
+stdenv.mkDerivation rec {
+  version = "8.6.3";
+
+  name = "ghc-${version}-binary";
+
+  src = fetchurl ({
+    "i686-linux" = {
+      url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-deb8-linux.tar.xz";
+      sha256 = "0bw8a7fxcbskf93rb4m542ff66vrmx5i5kj77qx37cbhijx70w5m";
+    };
+    "x86_64-linux" = {
+      url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-deb8-linux.tar.xz";
+      sha256 = "1m9gaga2pzi2cx5gvasg0rx1dlvr68gmi20l67652kag6xjsa719";
+    };
+    "x86_64-darwin" = {
+      url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz";
+      sha256 = "1hbzk57v45176kxcx848p5jn5p1xbp2129ramkbzsk6plyhnkl3r";
+    };
+  }.${stdenv.hostPlatform.system}
+    or (throw "cannot bootstrap GHC on this platform"));
+
+  nativeBuildInputs = [ perl ];
+  buildInputs = stdenv.lib.optionals (stdenv.targetPlatform.isAarch32 || stdenv.targetPlatform.isAarch64) [ llvm_39 ];
+
+  # Cannot patchelf beforehand due to relative RPATHs that anticipate
+  # the final install location/
+  ${libEnvVar} = libPath;
+
+  postUnpack =
+    # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib
+    # during linking
+    stdenv.lib.optionalString stdenv.isDarwin ''
+      export NIX_LDFLAGS+=" -no_dtrace_dof"
+      # not enough room in the object files for the full path to libiconv :(
+      for exe in $(find . -type f -executable); do
+        isScript $exe && continue
+        ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib
+        install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe
+      done
+    '' +
+
+    # Some scripts used during the build need to have their shebangs patched
+    ''
+      patchShebangs ghc-${version}/utils/
+      patchShebangs ghc-${version}/configure
+    '' +
+
+    # Strip is harmful, see also below. It's important that this happens
+    # first. The GHC Cabal build system makes use of strip by default and
+    # has hardcoded paths to /usr/bin/strip in many places. We replace
+    # those below, making them point to our dummy script.
+    ''
+      mkdir "$TMP/bin"
+      for i in strip; do
+        echo '#! ${stdenv.shell}' > "$TMP/bin/$i"
+        chmod +x "$TMP/bin/$i"
+      done
+      PATH="$TMP/bin:$PATH"
+    '' +
+    # We have to patch the GMP paths for the integer-gmp package.
+    ''
+      find . -name integer-gmp.buildinfo \
+          -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \;
+    '' + stdenv.lib.optionalString stdenv.isDarwin ''
+      find . -name base.buildinfo \
+          -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \;
+    '' +
+    # Rename needed libraries and binaries, fix interpreter
+    stdenv.lib.optionalString stdenv.isLinux ''
+      find . -type f -perm -0100 -exec patchelf \
+          --replace-needed libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5 libncurses.so \
+          --replace-needed libtinfo.so libtinfo.so.5 \
+          --interpreter ${glibcDynLinker} {} \;
+
+      sed -i "s|/usr/bin/perl|perl\x00        |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
+      sed -i "s|/usr/bin/gcc|gcc\x00        |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
+    '';
+
+  configurePlatforms = [ ];
+  configureFlags = [
+    "--with-gmp-libraries=${stdenv.lib.getLib gmp}/lib"
+    "--with-gmp-includes=${stdenv.lib.getDev gmp}/include"
+  ] ++ stdenv.lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"
+    ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override";
+
+  # Stripping combined with patchelf breaks the executables (they die
+  # with a segfault or the kernel even refuses the execve). (NIXPKGS-85)
+  dontStrip = true;
+
+  # No building is necessary, but calling make without flags ironically
+  # calls install-strip ...
+  dontBuild = true;
+
+  # On Linux, use patchelf to modify the executables so that they can
+  # find editline/gmp.
+  preFixup = stdenv.lib.optionalString stdenv.isLinux ''
+    for p in $(find "$out" -type f -executable); do
+      if isELF "$p"; then
+        echo "Patchelfing $p"
+        patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p
+      fi
+    done
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    # not enough room in the object files for the full path to libiconv :(
+    for exe in $(find "$out" -type f -executable); do
+      isScript $exe && continue
+      ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib
+      install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe
+    done
+
+    for file in $(find "$out" -name setup-config); do
+      substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)"
+    done
+  '';
+
+  doInstallCheck = true;
+  installCheckPhase = ''
+    unset ${libEnvVar}
+    # Sanity check, can ghc create executables?
+    cd $TMP
+    mkdir test-ghc; cd test-ghc
+    cat > main.hs << EOF
+      {-# LANGUAGE TemplateHaskell #-}
+      module Main where
+      main = putStrLn \$([|"yes"|])
+    EOF
+    $out/bin/ghc --make main.hs || exit 1
+    echo compilation ok
+    [ $(./main) == "yes" ]
+  '';
+
+  passthru = {
+    targetPrefix = "";
+    enableShared = true;
+  };
+
+  meta.license = stdenv.lib.licenses.bsd3;
+  meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"];
+}
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 65a4a0c4ecd..7e670743f7f 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -2,7 +2,7 @@
 
 # build-tools
 , bootPkgs
-, autoconf, automake, coreutils, fetchgit, perl, python3, m4, sphinx
+, autoconf, automake, coreutils, fetchgit, fetchurl, fetchpatch, perl, python3, m4, sphinx
 
 , libiconv ? null, ncurses
 
@@ -21,12 +21,12 @@
 
 , # Whether to build dynamic libs for the standard library (on the target
   # platform). Static libs are always built.
-  enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useAndroidPrebuilt
+  enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt
 
 , # Whetherto build terminfo.
   enableTerminfo ? !stdenv.targetPlatform.isWindows
 
-, version ? "8.5.20180118"
+, version ? "8.7.20190115"
 , # What flavour to build. An empty string indicates no
   # specific flavour and falls back to ghc default values.
   ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) "perf-cross"
@@ -84,9 +84,9 @@ stdenv.mkDerivation (rec {
   name = "${targetPrefix}ghc-${version}";
 
   src = fetchgit {
-    url = "git://git.haskell.org/ghc.git";
-    rev = "e1d4140be4d2a1508015093b69e1ef53516e1eb6";
-    sha256 = "1gdcr10dd968d40qgljdwx9vfkva3yrvjm9a4nis7whaaac3ag58";
+    url = "https://gitlab.haskell.org/ghc/ghc.git/";
+    rev = "c9756dbf1ee58b117ea5c4ded45dea88030efd65";
+    sha256 = "0ja3ivyz4jrqkw6z1mdgsczxaqkjy5vw0nyyqlqr0bqxiw9p8834";
   };
 
   enableParallelBuilding = true;
@@ -122,6 +122,24 @@ stdenv.mkDerivation (rec {
     export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
     export NIX_LDFLAGS+=" -no_dtrace_dof"
+  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+    sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
+  '' + stdenv.lib.optionalString targetPlatform.isMusl ''
+      echo "patching llvm-targets for musl targets..."
+      echo "Cloning these existing '*-linux-gnu*' targets:"
+      grep linux-gnu llvm-targets | sed 's/^/  /'
+      echo "(go go gadget sed)"
+      sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets
+      echo "llvm-targets now contains these '*-linux-musl*' targets:"
+      grep linux-musl llvm-targets | sed 's/^/  /'
+
+      echo "And now patching to preserve '-musleabi' as done with '-gnueabi'"
+      # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen)
+      for x in configure aclocal.m4; do
+        substituteInPlace $x \
+          --replace '*-android*|*-gnueabi*)' \
+                    '*-android*|*-gnueabi*|*-musleabi*)'
+      done
   '';
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
@@ -131,8 +149,8 @@ stdenv.mkDerivation (rec {
   configureFlags = [
     "--datadir=$doc/share/doc/ghc"
     "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
-  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && ! enableIntegerSimple) [
-    "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
+  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [
+    "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
   ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
     "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
   ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
@@ -149,12 +167,9 @@ stdenv.mkDerivation (rec {
   # Make sure we never relax`$PATH` and hooks support for compatability.
   strictDeps = true;
 
-  # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
-  dontAddExtraLibs = true;
-
   nativeBuildInputs = [
-    perl autoconf automake m4 python3
-    ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
+    perl autoconf automake m4 python3 sphinx
+    bootPkgs.ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
   ];
 
   # For building runtime libs
@@ -195,14 +210,14 @@ stdenv.mkDerivation (rec {
     inherit enableShared;
 
     # Our Cabal compiler name
-    haskellCompilerName = "ghc-8.5";
+    haskellCompilerName = "ghc-8.7";
   };
 
   meta = {
     homepage = http://haskell.org/ghc;
     description = "The Glasgow Haskell Compiler";
     maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
-    inherit (ghc.meta) license platforms;
+    inherit (bootPkgs.ghc.meta) license platforms;
   };
 
 } // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix
index 025d74bcda0..6fd844adbe5 100644
--- a/pkgs/development/compilers/ghcjs-ng/default.nix
+++ b/pkgs/development/compilers/ghcjs-ng/default.nix
@@ -104,4 +104,7 @@ in stdenv.mkDerivation {
     inherit passthru;
 
     meta.platforms = passthru.bootPkgs.ghc.meta.platforms;
+    meta.hydraPlatforms = [];
+    meta.broken = true;  # does not compile: https://hydra.nixos.org/build/88052615
+
   }
diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix
index 92a9291222f..867344e84da 100644
--- a/pkgs/development/compilers/go/1.10.nix
+++ b/pkgs/development/compilers/go/1.10.nix
@@ -22,13 +22,13 @@ in
 
 stdenv.mkDerivation rec {
   name = "go-${version}";
-  version = "1.10.7";
+  version = "1.10.8";
 
   src = fetchFromGitHub {
     owner = "golang";
     repo = "go";
     rev = "go${version}";
-    sha256 = "1alc7dagijdg4p4hhvlznlgcxsl8gz94v7p9wk3kn303y782dl41";
+    sha256 = "1yynv105wh8pwiq61v4yg5i50k13g3x634x60mhxhv4gj9cq06cx";
   };
 
   GOCACHE = "off";
diff --git a/pkgs/development/compilers/go/1.11.nix b/pkgs/development/compilers/go/1.11.nix
index ae682f8b8f8..1c9bc0a3009 100644
--- a/pkgs/development/compilers/go/1.11.nix
+++ b/pkgs/development/compilers/go/1.11.nix
@@ -29,13 +29,13 @@ in
 
 stdenv.mkDerivation rec {
   name = "go-${version}";
-  version = "1.11.4";
+  version = "1.11.5";
 
   src = fetchFromGitHub {
     owner = "golang";
     repo = "go";
     rev = "go${version}";
-    sha256 = "036nc17hffy0gcfs9j64qzwpjry65znbm4klf2h0xn81dp8d6mxk";
+    sha256 = "0d45057rc0bngq0nja847cagxji42qmlywr68f0dkg51im8nyr9y";
   };
 
   # perl is used for testing go vet
diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix
deleted file mode 100644
index d0142b93bd1..00000000000
--- a/pkgs/development/compilers/go/1.9.nix
+++ /dev/null
@@ -1,184 +0,0 @@
-{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
-, perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation }:
-
-let
-
-  inherit (stdenv.lib) optionals optionalString;
-
-  clangHack = writeScriptBin "clang" ''
-    #!${stdenv.shell}
-    exec ${stdenv.cc}/bin/clang "$@" 2> >(sed '/ld: warning:.*ignoring unexpected dylib file/ d' 1>&2)
-  '';
-
-  goBootstrap = runCommand "go-bootstrap" {} ''
-    mkdir $out
-    cp -rf ${go_bootstrap}/* $out/
-    chmod -R u+w $out
-    find $out -name "*.c" -delete
-    cp -rf $out/bin/* $out/share/go/bin/
-  '';
-
-in
-
-stdenv.mkDerivation rec {
-  name = "go-${version}";
-  version = "1.9.7";
-
-  src = fetchFromGitHub {
-    owner = "golang";
-    repo = "go";
-    rev = "go${version}";
-    sha256 = "16bvpw0kkd2vv4d83m8xnbq3f1hfy642p7lfvk64h5h1663vpc2v";
-  };
-
-  # perl is used for testing go vet
-  nativeBuildInputs = [ perl which pkgconfig patch procps ];
-  buildInputs = [ cacert pcre ]
-    ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
-    ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
-  propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ];
-
-  hardeningDisable = [ "all" ];
-
-  prePatch = ''
-    patchShebangs ./ # replace /bin/bash
-
-    # This source produces shell script at run time,
-    # and thus it is not corrected by patchShebangs.
-    substituteInPlace misc/cgo/testcarchive/carchive_test.go \
-      --replace '#!/usr/bin/env bash' '#!${stdenv.shell}'
-
-    # Disabling the 'os/http/net' tests (they want files not available in
-    # chroot builds)
-    rm src/net/{listen,parse}_test.go
-    rm src/syscall/exec_linux_test.go
-
-    # !!! substituteInPlace does not seems to be effective.
-    # The os test wants to read files in an existing path. Just don't let it be /usr/bin.
-    sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go
-    sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go
-    # Disable the unix socket test
-    sed -i '/TestShutdownUnix/areturn' src/net/net_test.go
-    # Disable the hostname test
-    sed -i '/TestHostname/areturn' src/os/os_test.go
-    # ParseInLocation fails the test
-    sed -i '/TestParseInSydney/areturn' src/time/format_test.go
-    # Remove the api check as it never worked
-    sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go
-    # Remove the coverage test as we have removed this utility
-    sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go
-    # Remove the timezone naming test
-    sed -i '/TestLoadFixed/areturn' src/time/time_test.go
-    # Remove disable setgid test
-    sed -i '/TestRespectSetgidDir/areturn' src/cmd/go/internal/work/build_test.go
-    # Remove cert tests that conflict with NixOS's cert resolution
-    sed -i '/TestEnvVars/areturn' src/crypto/x509/root_unix_test.go
-    # TestWritevError hangs sometimes
-    sed -i '/TestWritevError/areturn' src/net/writev_test.go
-    # TestVariousDeadlines fails sometimes
-    sed -i '/TestVariousDeadlines/areturn' src/net/timeout_test.go
-
-    sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go
-    sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go
-
-    # Disable cgo lookup tests not works, they depend on resolver
-    rm src/net/cgo_unix_test.go
-
-  '' + optionalString stdenv.isLinux ''
-    sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go
-  '' + optionalString stdenv.isAarch32 ''
-    sed -i '/TestCurrent/areturn' src/os/user/user_test.go
-    echo '#!${stdenv.shell}' > misc/cgo/testplugin/test.bash
-  '' + optionalString stdenv.isDarwin ''
-    substituteInPlace src/race.bash --replace \
-      "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true
-    sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go
-    sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go
-    sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go
-
-    sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go
-    sed -i '/TestCredentialNoSetGroups/areturn' src/os/exec/exec_posix_test.go
-    sed -i '/TestCurrent/areturn' src/os/user/user_test.go
-    sed -i '/TestNohup/areturn' src/os/signal/signal_test.go
-    sed -i '/TestRead0/areturn' src/os/os_test.go
-    sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go
-
-    sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go
-    sed -i '/TestBuildDashIInstallsDependencies/areturn' src/cmd/go/go_test.go
-
-    sed -i '/TestDisasmExtld/areturn' src/cmd/objdump/objdump_test.go
-
-    sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go
-
-    touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd
-
-    sed -i '1 a\exit 0' misc/cgo/errors/test.bash
-  '';
-
-  patches =
-    [ ./remove-tools-1.9.patch
-      ./ssl-cert-file-1.9.patch
-      ./creds-test-1.9.patch
-      ./remove-test-pie-1.9.patch
-      ./go-1.9-skip-flaky-19608.patch
-      ./go-1.9-skip-flaky-20072.patch
-    ];
-
-  postPatch = optionalString stdenv.isDarwin ''
-    echo "substitute hardcoded dsymutil with ${llvm}/bin/llvm-dsymutil"
-    substituteInPlace "src/cmd/link/internal/ld/lib.go" --replace dsymutil ${llvm}/bin/llvm-dsymutil
-  '';
-
-  GOOS = if stdenv.isDarwin then "darwin" else "linux";
-  GOARCH = if stdenv.isDarwin then "amd64"
-           else if stdenv.hostPlatform.system == "i686-linux" then "386"
-           else if stdenv.hostPlatform.system == "x86_64-linux" then "amd64"
-           else if stdenv.isAarch32 then "arm"
-           else if stdenv.isAarch64 then "arm64"
-           else throw "Unsupported system";
-  GOARM = optionalString (stdenv.hostPlatform.system == "armv5tel-linux") "5";
-  GO386 = 387; # from Arch: don't assume sse2 on i686
-  CGO_ENABLED = 1;
-  GOROOT_BOOTSTRAP = "${goBootstrap}/share/go";
-  # Hopefully avoids test timeouts on Hydra
-  GO_TEST_TIMEOUT_SCALE = 3;
-
-  # The go build actually checks for CC=*/clang and does something different, so we don't
-  # just want the generic `cc` here.
-  CC = if stdenv.isDarwin then "clang" else "cc";
-
-  configurePhase = ''
-    mkdir -p $out/share/go/bin
-    export GOROOT=$out/share/go
-    export GOBIN=$GOROOT/bin
-    export PATH=$GOBIN:$PATH
-    ulimit -a
-  '';
-
-  postConfigure = optionalString stdenv.isDarwin ''
-    export PATH=${clangHack}/bin:$PATH
-  '';
-
-  installPhase = ''
-    cp -r . $GOROOT
-    ( cd $GOROOT/src && ./all.bash )
-  '';
-
-  preFixup = ''
-    rm -r $out/share/go/pkg/bootstrap
-    ln -s $out/share/go/bin $out/bin
-  '';
-
-  setupHook = ./setup-hook.sh;
-
-  disallowedReferences = [ go_bootstrap ];
-
-  meta = with stdenv.lib; {
-    branch = "1.9";
-    homepage = http://golang.org/;
-    description = "The Go Programming language";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ cstrahan orivej ];
-    platforms = platforms.linux ++ platforms.darwin;
-  };
-}
diff --git a/pkgs/development/compilers/go/creds-test-1.9.patch b/pkgs/development/compilers/go/creds-test-1.9.patch
deleted file mode 100644
index 09f78959ff9..00000000000
--- a/pkgs/development/compilers/go/creds-test-1.9.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru -x '*~' ./result/src/syscall/creds_test.go go-go1.7.4-src/src/syscall/creds_test.go
---- ./result/src/syscall/creds_test.go	1970-01-01 01:00:01.000000000 +0100
-+++ go-go1.7.4-src/src/syscall/creds_test.go	2016-12-21 14:06:39.559932164 +0100
-@@ -62,8 +62,8 @@
- 		if sys, ok := err.(*os.SyscallError); ok {
- 			err = sys.Err
- 		}
--		if err != syscall.EPERM {
--			t.Fatalf("WriteMsgUnix failed with %v, want EPERM", err)
-+		if err != syscall.EPERM && err != syscall.EINVAL {
-+			t.Fatalf("WriteMsgUnix failed with %v, want EPERM or EINVAL", err)
- 		}
- 	}
- 
diff --git a/pkgs/development/compilers/go/remove-test-pie-1.9.patch b/pkgs/development/compilers/go/remove-test-pie-1.9.patch
deleted file mode 100644
index 46f94f29df2..00000000000
--- a/pkgs/development/compilers/go/remove-test-pie-1.9.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
-index 73432d31ea..3310f5298d 100644
---- a/src/cmd/dist/test.go
-+++ b/src/cmd/dist/test.go
-@@ -510,21 +510,6 @@ func (t *tester) registerTests() {
- 		})
- 	}
- 
--	// Test internal linking of PIE binaries where it is supported.
--	if t.goos == "linux" && t.goarch == "amd64" && !isAlpineLinux() {
--		// Issue 18243: We don't have a way to set the default
--		// dynamic linker used in internal linking mode. So
--		// this test is skipped on Alpine.
--		t.tests = append(t.tests, distTest{
--			name:    "pie_internal",
--			heading: "internal linking of -buildmode=pie",
--			fn: func(dt *distTest) error {
--				t.addCmd(dt, "src", "go", "test", "reflect", "-short", "-buildmode=pie", "-ldflags=-linkmode=internal", t.timeout(60), t.tags(), t.runFlag(""))
--				return nil
--			},
--		})
--	}
--
- 	// sync tests
- 	t.tests = append(t.tests, distTest{
- 		name:    "sync_cpu",
diff --git a/pkgs/development/compilers/julia/0.7.nix b/pkgs/development/compilers/julia/0.7.nix
index 99c6b245ba6..e0992d80003 100644
--- a/pkgs/development/compilers/julia/0.7.nix
+++ b/pkgs/development/compilers/julia/0.7.nix
@@ -3,4 +3,7 @@ import ./shared.nix {
   minorVersion = "7";
   maintenanceVersion = "0";
   src_sha256 = "1j57569qm2ii8ddzsp08hds2navpk7acdz83kh27dvk44axhwj6f";
+
+  libuvVersion = "ed3700c849289ed01fe04273a7bf865340b2bd7e";
+  libuvSha256 = "137w666zsjw1p0ma3lf94d75hr1q45sgkfmbizkyji2qm57cnxjs";
 }
diff --git a/pkgs/development/compilers/julia/1.0.nix b/pkgs/development/compilers/julia/1.0.nix
index c65c2a6a313..a679eda3306 100644
--- a/pkgs/development/compilers/julia/1.0.nix
+++ b/pkgs/development/compilers/julia/1.0.nix
@@ -3,4 +3,7 @@ import ./shared.nix {
   minorVersion = "0";
   maintenanceVersion = "3";
   src_sha256 = "0666chsc19wx02k5m1yilf6wbc9bw27ay8p1d00jkh8m0jkrpf7l";
+
+  libuvVersion = "ed3700c849289ed01fe04273a7bf865340b2bd7e";
+  libuvSha256 = "137w666zsjw1p0ma3lf94d75hr1q45sgkfmbizkyji2qm57cnxjs";
 }
diff --git a/pkgs/development/compilers/julia/1.1.nix b/pkgs/development/compilers/julia/1.1.nix
new file mode 100644
index 00000000000..a868f949d27
--- /dev/null
+++ b/pkgs/development/compilers/julia/1.1.nix
@@ -0,0 +1,9 @@
+import ./shared.nix {
+  majorVersion = "1";
+  minorVersion = "1";
+  maintenanceVersion = "0";
+  src_sha256 = "08fyck4qcdv9nnrdqh1wb7lb8pkkikh67xx5lc872sjl9w3p0sak";
+
+  libuvVersion = "2348256acf5759a544e5ca7935f638d2bc091d60";
+  libuvSha256 = "1363f4vqayfcv5zqg07qmzjff56yhad74k16c22ian45lram8mv8";
+}
diff --git a/pkgs/development/compilers/julia/shared.nix b/pkgs/development/compilers/julia/shared.nix
index 95b45adcc6f..ee08703e4c7 100644
--- a/pkgs/development/compilers/julia/shared.nix
+++ b/pkgs/development/compilers/julia/shared.nix
@@ -2,6 +2,9 @@
 , minorVersion
 , maintenanceVersion
 , src_sha256
+# source deps
+, libuvVersion
+, libuvSha256
 }:
 { stdenv, fetchurl, fetchzip
 # build tools
@@ -34,10 +37,9 @@ let
     sha256 = "03kaqbjbi6viz0n33dk5jlf6ayxqlsq4804n7kwkndiga9s4hd42";
   };
 
-  libuvVersion = "ed3700c849289ed01fe04273a7bf865340b2bd7e";
   libuv = fetchurl {
     url = "https://api.github.com/repos/JuliaLang/libuv/tarball/${libuvVersion}";
-    sha256 = "137w666zsjw1p0ma3lf94d75hr1q45sgkfmbizkyji2qm57cnxjs";
+    sha256 = libuvSha256;
   };
 
   rmathVersion = "0.1";
diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index f557f32a13a..c2d834aa127 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, makeWrapper, jre, unzip }:
 
 let
-  version = "1.3.11";
+  version = "1.3.20";
 in stdenv.mkDerivation rec {
   inherit version;
   name = "kotlin-${version}";
 
   src = fetchurl {
     url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
-    sha256 = "02d4x65z6kp20hmf5ri56zmq4rq45yc9br0awqrn9ls99cd0zph3";
+    sha256 = "1w7k09sxlvyy53p4mxnl4qsnsyivpabhsmradbybfgf50nsmyl1d";
   };
 
   propagatedBuildInputs = [ jre ] ;
diff --git a/pkgs/development/compilers/purescript/psc-package/default.nix b/pkgs/development/compilers/purescript/psc-package/default.nix
index 24043ce4774..68b676d5a3e 100644
--- a/pkgs/development/compilers/purescript/psc-package/default.nix
+++ b/pkgs/development/compilers/purescript/psc-package/default.nix
@@ -4,13 +4,13 @@ with lib;
 
 mkDerivation rec {
   pname = "psc-package";
-  version = "0.4.2";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "purescript";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0xvnmpfj4c6h4gmc2c3d4gcs44527jrgfl11l2fs4ai1mc69w5zg";
+    sha256 = "1zadbph1vha3b5hvmjvs138dcwbab49f3v63air1l6r4cvpb6831";
   };
 
   isLibrary = false;
diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 5f1c35815c3..80ca6ade845 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, writeText, sbclBootstrap
+{ stdenv, fetchurl, writeText, sbclBootstrap
 , sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit"
 , threadSupport ? (stdenv.isi686 || stdenv.isx86_64 || "aarch64-linux" == stdenv.hostPlatform.system)
   # Meant for sbcl used for creating binaries portable to non-NixOS via save-lisp-and-die.
@@ -10,28 +10,16 @@
 
 stdenv.mkDerivation rec {
   name    = "sbcl-${version}";
-  version = "1.4.15";
+  version = "1.4.16";
 
   src = fetchurl {
     url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-    sha256 = "0bipl4gsvpcifi6vkqm5636i3219mk1bl99px4xh5l1q2g7knv28";
+    sha256 = "1myg4wkxnbfn5nz38xy62r1jhjy07x3h0b04vg858n41chdsv4wd";
   };
 
   buildInputs = [texinfo];
 
-  patches = [
-    # 1.4.15 bug, run-program thread safety, remove for 1.4.16
-    (fetchpatch {
-      url = "https://github.com/sbcl/sbcl/commit/c80672bedb1e4bc16124d0d01d7e37f94dd17a5a.patch";
-      sha256 = "0pjm9yajwij59gdkqhid7sbgmb8z57cz8zrsikxg7yzfgr7sa7hy";
-    })
-  ];
-
   patchPhase = ''
-    for patch in ${toString patches}; do
-      patch -Np1 -i "$patch"
-    done
-
     echo '"${version}.nixos"' > version.lisp-expr
     echo "
     (lambda (features)
@@ -80,7 +68,8 @@ stdenv.mkDerivation rec {
     else
       # Fix software version retrieval
       ''
-        sed -e "s@/bin/uname@$(command -v uname)@g" -i src/code/*-os.lisp
+        sed -e "s@/bin/uname@$(command -v uname)@g" -i src/code/*-os.lisp \
+          src/code/run-program.lisp
       ''
     );
 
diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix
index 96954eb43ac..34daebcdf52 100644
--- a/pkgs/development/coq-modules/QuickChick/default.nix
+++ b/pkgs/development/coq-modules/QuickChick/default.nix
@@ -28,7 +28,7 @@ let params =
       propagatedBuildInputs = [ coq-ext-lib simple-io ];
     };
   };
-  param = params."${coq.coq-version}";
+  param = params."${coq.coq-version}" or params."8.8";
 in
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/coq-modules/Velisarios/default.nix b/pkgs/development/coq-modules/Velisarios/default.nix
index cd7ddfefb84..aa5ebb32b3c 100644
--- a/pkgs/development/coq-modules/Velisarios/default.nix
+++ b/pkgs/development/coq-modules/Velisarios/default.nix
@@ -20,7 +20,7 @@ let params =
       sha256 = "0l9885nxy0n955fj1gnijlxl55lyxiv9yjfmz8hmfrn9hl8vv1m2";
     };
   };
-  param = params."${coq.coq-version}";
+  param = params."${coq.coq-version}" or params."8.8";
 in
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/coq-modules/category-theory/default.nix b/pkgs/development/coq-modules/category-theory/default.nix
index 59f2295e215..a8fd91d9d34 100644
--- a/pkgs/development/coq-modules/category-theory/default.nix
+++ b/pkgs/development/coq-modules/category-theory/default.nix
@@ -18,7 +18,7 @@ let
     "8.7" = v20180709;
     "8.8" = v20181016;
   };
-  param = params."${coq.coq-version}";
+  param = params."${coq.coq-version}" or params."8.8";
 in
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/coq-modules/coq-extensible-records/default.nix b/pkgs/development/coq-modules/coq-extensible-records/default.nix
new file mode 100644
index 00000000000..513b046c0fe
--- /dev/null
+++ b/pkgs/development/coq-modules/coq-extensible-records/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, coq }:
+
+stdenv.mkDerivation {
+  name = "coq${coq.coq-version}-coq-extensible-records-1.2.0";
+
+  src = fetchFromGitHub {
+    owner = "gmalecha";
+    repo = "coq-extensible-records";
+    rev = "1.2.0";
+    sha256 = "0h5m04flqfk0v577syw0v1dw2wf7xrx6jaxv5gpmqzssf5hxafy4";
+  };
+
+  buildInputs = [ coq ];
+
+  enableParallelBuilding = true;
+
+  installPhase = ''
+    make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/gmalecha/coq-extensible-records;
+    description = "Implementation of extensible records in Coq";
+    license = licenses.mit;
+    maintainers = with maintainers; [ ptival ];
+    platforms = coq.meta.platforms;
+  };
+
+  passthru = {
+    compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" ];
+  };
+}
diff --git a/pkgs/development/coq-modules/coq-haskell/default.nix b/pkgs/development/coq-modules/coq-haskell/default.nix
index 57f31e1847c..784e360a0da 100644
--- a/pkgs/development/coq-modules/coq-haskell/default.nix
+++ b/pkgs/development/coq-modules/coq-haskell/default.nix
@@ -26,7 +26,7 @@ let params =
       sha256 = "09dq1vvshhlhgjccrhqgbhnq2hrys15xryfszqq11rzpgvl2zgdv";
     };
   };
-  param = params."${coq.coq-version}";
+  param = params."${coq.coq-version}" or params."8.8";
 in
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/coq-modules/coqprime/default.nix b/pkgs/development/coq-modules/coqprime/default.nix
index 191812b3f2e..265b97deca2 100644
--- a/pkgs/development/coq-modules/coqprime/default.nix
+++ b/pkgs/development/coq-modules/coqprime/default.nix
@@ -14,7 +14,7 @@ let params =
     "8.8" = v_8_8;
     "8.9" = v_8_8;
     };
-  param = params."${coq.coq-version}"
+  param = params."${coq.coq-version}" or params."8.9"
 ; in
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix
index e403f7d4fb5..6a06c1b1987 100644
--- a/pkgs/development/coq-modules/dpdgraph/default.nix
+++ b/pkgs/development/coq-modules/dpdgraph/default.nix
@@ -22,7 +22,7 @@ let params = {
     sha256 = "0qvar8gfbrcs9fmvkph5asqz4l5fi63caykx3bsn8zf0xllkwv0n";
   };
 };
-param = params."${coq.coq-version}";
+param = params."${coq.coq-version}" or params."8.8";
 in
 
 stdenv.mkDerivation {
diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix
index 3f049eed34b..1bc66fcf272 100644
--- a/pkgs/development/coq-modules/equations/default.nix
+++ b/pkgs/development/coq-modules/equations/default.nix
@@ -19,8 +19,14 @@ let
       rev = "v1.0-8.8";
       sha256 = "0dd7zd5j2sv5cw3mfwg33ss2vcj634q3qykakc41sv7f3rfgqfnn";
     };
+
+    "8.9" = {
+      version = "1.2beta";
+      rev = "v1.2-beta-8.9";
+      sha256 = "1sj7vyarmvp1w5kvbhgpgap1yd0yrj4n1jrla0wv70k0jrq5hhpz";
+    };
   };
-  param = params."${coq.coq-version}";
+  param = params."${coq.coq-version}" or params."8.8";
 in
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index bff993a0e69..3ff96bf2544 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -358,6 +358,7 @@ self: super: {
   persistent-redis = dontCheck super.persistent-redis;
   pipes-extra = dontCheck super.pipes-extra;
   pipes-websockets = dontCheck super.pipes-websockets;
+  posix-pty = dontCheck super.posix-pty; # https://github.com/merijn/posix-pty/issues/12
   postgresql-binary = dontCheck super.postgresql-binary; # needs a running postgresql server
   postgresql-simple-migration = dontCheck super.postgresql-simple-migration;
   process-streaming = dontCheck super.process-streaming;
@@ -927,15 +928,6 @@ self: super: {
   # https://github.com/bos/text-icu/issues/32
   text-icu = dontCheck super.text-icu;
 
-  # https://github.com/haskell/cabal/issues/4969
-  # haddock-api = (super.haddock-api.overrideScope (self: super: {
-  #   haddock-library = self.haddock-library_1_6_0;
-  # })).override { hspec = self.hspec_2_4_8; };
-
-  # Jailbreak "unix-compat >=0.1.2 && <0.5".
-  # Jailbreak "graphviz >=2999.18.1 && <2999.20".
-  darcs = overrideCabal super.darcs (drv: { preConfigure = "sed -i -e 's/unix-compat .*,/unix-compat,/' -e 's/fgl .*,/fgl,/' -e 's/graphviz .*,/graphviz,/' darcs.cabal"; });
-
   # aarch64 and armv7l fixes.
   happy = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062
   hashable = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.hashable else super.hashable; # https://github.com/tibbe/hashable/issues/95
@@ -1099,10 +1091,6 @@ self: super: {
   cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;
   stack = generateOptparseApplicativeCompletion "stack" super.stack;
 
-  # https://github.com/pikajude/stylish-cabal/issues/11
-  stylish-cabal = super.stylish-cabal.override { hspec = self.hspec_2_4_8; hspec-core = self.hspec-core_2_4_8; };
-  hspec_2_4_8 = super.hspec_2_4_8.override { hspec-core = self.hspec-core_2_4_8; hspec-discover = self.hspec-discover_2_4_8; };
-
   # musl fixes
   # dontCheck: use of non-standard strptime "%s" which musl doesn't support; only used in test
   unix-time = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.unix-time else super.unix-time;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index 7a5b78ba74c..cad85417011 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -91,12 +91,11 @@ self: super: {
   distribution-nixpkgs = super.distribution-nixpkgs.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; });
   hackage-db_2_0_1 = super.hackage-db_2_0_1.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; });
   stack = super.stack.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; });
-  stylish-cabal = dontCheck (super.stylish-cabal.overrideScope (self: super: {
-    Cabal = self.Cabal_2_2_0_1;
-    haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1);
-  }));
 
   # GHC 8.2 doesn't have semigroups included by default
   ListLike = addBuildDepend super.ListLike self.semigroups;
 
+  # https://github.com/pikajude/stylish-cabal/issues/11
+  stylish-cabal = markBrokenVersion "0.4.1.0" super.stylish-cabal;
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 83cb831345c..04e0a755d10 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -71,4 +71,9 @@ self: super: {
     yaml = self.yaml_0_11_0_0;
   };
 
+  # https://github.com/pikajude/stylish-cabal/issues/11
+  stylish-cabal = generateOptparseApplicativeCompletion "stylish-cabal" (super.stylish-cabal.overrideScope (self: super: {
+    haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1);
+  }));
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index 979e89655ac..b6aae3d8e73 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -68,4 +68,7 @@ self: super: {
   # Break out of "yaml >=0.10.4.0 && <0.11": https://github.com/commercialhaskell/stack/issues/4485
   stack = doJailbreak super.stack;
 
+  # https://github.com/pikajude/stylish-cabal/issues/11
+  stylish-cabal = markBrokenVersion "0.4.1.0" super.stylish-cabal;
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix
index b71f75033f0..d4ff521273d 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-head.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix
@@ -1,11 +1,18 @@
+##
+## Caveat: a copy of configuration-ghc-8.6.x.nix with minor changes:
+##
+##  1. "8.7" strings
+##  2. llvm 6
+##  3. disabled library update: parallel
+##
 { pkgs, haskellLib }:
 
 with haskellLib;
 
 self: super: {
 
-  # This compiler version needs llvm 5.x.
-  llvmPackages = pkgs.llvmPackages_5;
+  # This compiler version needs llvm 6.x.
+  llvmPackages = pkgs.llvmPackages_6;
 
   # Disable GHC 8.7.x core libraries.
   array = null;
@@ -20,12 +27,15 @@ self: super: {
   ghc-boot = null;
   ghc-boot-th = null;
   ghc-compact = null;
-  ghc-prim = null;
+  ghc-heap = null;
   ghci = null;
+  ghc-prim = null;
   haskeline = null;
   hpc = null;
   integer-gmp = null;
+  libiserv = null;
   mtl = null;
+  parallel = null;
   parsec = null;
   pretty = null;
   process = null;
@@ -39,60 +49,37 @@ self: super: {
   unix = null;
   xhtml = null;
 
-  # jailbreak-cabal can use the native Cabal library.
-  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; };
-
-  # haddock: No input file(s).
-  nats = dontHaddock super.nats;
-  bytestring-builder = dontHaddock super.bytestring-builder;
-
-  # We have time 1.5
-  aeson = disableCabalFlag super.aeson "old-locale";
-
-  # Setup: At least the following dependencies are missing: base <4.8
-  hspec-expectations = overrideCabal super.hspec-expectations (drv: {
-    postPatch = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal";
-  });
-  utf8-string = overrideCabal super.utf8-string (drv: {
-    postPatch = "sed -i -e 's|base >= 4.3 && < 4.10|base|' utf8-string.cabal";
-  });
-
-  # bos/attoparsec#92
-  attoparsec = dontCheck super.attoparsec;
-
-  # test suite hangs silently for at least 10 minutes
-  split = dontCheck super.split;
-
-  # Test suite fails with some (seemingly harmless) error.
-  # https://code.google.com/p/scrapyourboilerplate/issues/detail?id=24
-  syb = dontCheck super.syb;
-
-  # Test suite has stricter version bounds
-  retry = dontCheck super.retry;
-
-  # Test suite fails with time >= 1.5
-  http-date = dontCheck super.http-date;
-
-  # Version 1.19.5 fails its test suite.
-  happy = dontCheck super.happy;
-
-  # Workaround for a workaround, see comment for "ghcjs" flag.
-  jsaddle = let jsaddle' = disableCabalFlag super.jsaddle "ghcjs";
-            in addBuildDepends jsaddle' [ self.glib self.gtk3 self.webkitgtk3
-                                          self.webkitgtk3-javascriptcore ];
-
-  # The compat library is empty in the presence of mtl 2.2.x.
-  mtl-compat = dontHaddock super.mtl-compat;
-
-  # Won't work with LLVM 3.5.
-  llvm-general = markBrokenVersion "3.4.5.3" super.llvm-general;
-
-  # A bunch of jailbreaks due to 'base' bump
-  old-time = doJailbreak super.old-time;
-  old-locale = doJailbreak super.old-locale;
-  primitive = doJailbreak super.primitive;
-  test-framework = doJailbreak super.test-framework;
-  atomic-primops = doJailbreak (appendPatch super.atomic-primops ./patches/atomic-primops-Cabal-1.25.patch);
-  hashable = doJailbreak super.hashable;
+  # https://github.com/tibbe/unordered-containers/issues/214
+  unordered-containers = dontCheck super.unordered-containers;
+
+  # Test suite does not compile.
+  cereal = dontCheck super.cereal;
+  data-clist = doJailbreak super.data-clist;  # won't cope with QuickCheck 2.12.x
+  dates = doJailbreak super.dates; # base >=4.9 && <4.12
+  Diff = dontCheck super.Diff;
+  HaTeX = doJailbreak super.HaTeX; # containers >=0.4 && <0.6 is too tight; https://github.com/Daniel-Diaz/HaTeX/issues/126
+  hpc-coveralls = doJailbreak super.hpc-coveralls; # https://github.com/guillaume-nargeot/hpc-coveralls/issues/82
+  http-api-data = doJailbreak super.http-api-data;
+  persistent-sqlite = dontCheck super.persistent-sqlite;
+  psqueues = dontCheck super.psqueues;    # won't cope with QuickCheck 2.12.x
+  system-fileio = dontCheck super.system-fileio;  # avoid dependency on broken "patience"
+  unicode-transforms = dontCheck super.unicode-transforms;
+  wl-pprint-extras = doJailbreak super.wl-pprint-extras; # containers >=0.4 && <0.6 is too tight; https://github.com/ekmett/wl-pprint-extras/issues/17
+  RSA = dontCheck super.RSA; # https://github.com/GaloisInc/RSA/issues/14
+  monad-par = dontCheck super.monad-par;  # https://github.com/simonmar/monad-par/issues/66
+  github = dontCheck super.github; # hspec upper bound exceeded; https://github.com/phadej/github/pull/341
+  binary-orphans = dontCheck super.binary-orphans; # tasty upper bound exceeded; https://github.com/phadej/binary-orphans/commit/8ce857226595dd520236ff4c51fa1a45d8387b33
+
+  # https://github.com/jgm/skylighting/issues/55
+  skylighting-core = dontCheck super.skylighting-core;
+
+  # Break out of "yaml >=0.10.4.0 && <0.11": https://github.com/commercialhaskell/stack/issues/4485
+  stack = doJailbreak super.stack;
+
+  # Fix build with ghc 8.6.x.
+  git-annex = appendPatch super.git-annex ./patches/git-annex-fix-ghc-8.6.x-build.patch;
+
+  # https://github.com/pikajude/stylish-cabal/issues/11
+  stylish-cabal = markBrokenVersion "0.4.1.0" super.stylish-cabal;
 
 }
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index b35f03a9634..e4848f0283e 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -46,7 +46,7 @@ default-package-overrides:
   # Newer versions don't work in LTS-12.x
   - alsa-mixer < 0.3
   - cassava-megaparsec < 2
-  # LTS Haskell 13.4
+  # LTS Haskell 13.5
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -408,7 +408,7 @@ default-package-overrides:
   - clock-extras ==0.1.0.2
   - clr-host ==0.2.1.0
   - clr-marshal ==0.2.0.0
-  - clumpiness ==0.17.0.0
+  - clumpiness ==0.17.0.2
   - cmark ==0.5.6
   - cmark-gfm ==0.1.6
   - cmdargs ==0.10.20
@@ -549,7 +549,7 @@ default-package-overrides:
   - data-msgpack-types ==0.0.2
   - data-or ==1.0.0.5
   - data-ordlist ==0.4.7.0
-  - data-ref ==0.0.1.2
+  - data-ref ==0.0.2
   - data-reify ==0.6.1
   - data-serializer ==0.3.4
   - data-textual ==0.3.0.2
@@ -558,7 +558,7 @@ default-package-overrides:
   - DAV ==1.3.3
   - dbcleaner ==0.1.3
   - DBFunctor ==0.1.0.0
-  - dbus ==1.2.1
+  - dbus ==1.2.3
   - debian-build ==0.10.1.2
   - debug ==0.1.1
   - debug-trace-var ==0.2.0
@@ -574,7 +574,7 @@ default-package-overrides:
   - dependent-sum-template ==0.0.0.6
   - deque ==0.2.7
   - deriveJsonNoPrefix ==0.1.0.1
-  - deriving-compat ==0.5.2
+  - deriving-compat ==0.5.4
   - derulo ==1.0.5
   - detour-via-sci ==1.0.0
   - dhall ==1.19.1
@@ -648,7 +648,7 @@ default-package-overrides:
   - elm-core-sources ==1.0.0
   - elm-export ==0.6.0.1
   - emacs-module ==0.1.1
-  - email-validate ==2.3.2.9
+  - email-validate ==2.3.2.10
   - emd ==0.1.4.0
   - enclosed-exceptions ==1.0.3
   - entropy ==0.4.1.4
@@ -746,7 +746,7 @@ default-package-overrides:
   - force-layout ==0.4.0.6
   - foreign-store ==0.2
   - forkable-monad ==0.2.0.3
-  - forma ==1.1.0
+  - forma ==1.1.1
   - format-numbers ==0.1.0.0
   - formatting ==6.3.7
   - foundation ==0.0.21
@@ -838,7 +838,7 @@ default-package-overrides:
   - gitrev ==1.3.1
   - gi-vte ==2.91.19
   - gl ==0.8.0
-  - glabrous ==1.0.0
+  - glabrous ==1.0.1
   - glaze ==0.3.0.1
   - glazier ==1.0.0.0
   - GLFW-b ==3.2.1.0
@@ -857,7 +857,7 @@ default-package-overrides:
   - gpolyline ==0.1.0.1
   - graph-core ==0.3.0.0
   - graphs ==0.7.1
-  - graph-wrapper ==0.2.5.2
+  - graph-wrapper ==0.2.6.0
   - gravatar ==0.8.0
   - graylog ==0.1.0.1
   - greskell ==0.2.3.0
@@ -869,7 +869,7 @@ default-package-overrides:
   - groundhog-postgresql ==0.10
   - groundhog-sqlite ==0.10.0
   - groups ==0.4.1.0
-  - guarded-allocation ==0.0
+  - guarded-allocation ==0.0.1
   - gym-http-api ==0.1.0.1
   - h2c ==1.0.0
   - hackage-db ==2.0.1
@@ -880,7 +880,7 @@ default-package-overrides:
   - hamilton ==0.1.0.3
   - hamtsolo ==1.0.3
   - HandsomeSoup ==0.4.2
-  - hapistrano ==0.3.9.0
+  - hapistrano ==0.3.9.1
   - happy ==1.19.9
   - hasbolt ==0.1.3.2
   - hashable ==1.2.7.0
@@ -989,7 +989,7 @@ default-package-overrides:
   - hslua ==1.0.2
   - hslua-aeson ==1.0.0
   - hslua-module-text ==0.2.0
-  - HsOpenSSL ==0.11.4.15
+  - HsOpenSSL ==0.11.4.16
   - HsOpenSSL-x509-system ==0.1.0.3
   - hsp ==0.10.0
   - hspec ==2.6.1
@@ -1015,7 +1015,7 @@ default-package-overrides:
   - HStringTemplate ==0.8.7
   - HSvm ==0.1.0.3.22
   - HsYAML ==0.1.1.3
-  - hsyslog ==5.0.1
+  - hsyslog ==5.0.2
   - htaglib ==1.2.0
   - HTF ==0.13.2.5
   - html ==1.0.1.2
@@ -1038,10 +1038,10 @@ default-package-overrides:
   - http-reverse-proxy ==0.6.0
   - http-streams ==0.8.6.1
   - http-types ==0.12.2
-  - human-readable-duration ==0.2.1.2
+  - human-readable-duration ==0.2.1.3
   - HUnit ==1.6.0.0
   - HUnit-approx ==1.1.1.1
-  - hunit-dejafu ==1.2.0.6
+  - hunit-dejafu ==1.2.1.0
   - hvect ==0.4.0.0
   - hvega ==0.1.0.3
   - hw-balancedparens ==0.2.0.2
@@ -1097,7 +1097,7 @@ default-package-overrides:
   - indexed-list-literals ==0.2.1.2
   - infer-license ==0.2.0
   - inflections ==0.4.0.4
-  - influxdb ==1.6.1.1
+  - influxdb ==1.6.1.2
   - ini ==0.3.6
   - inline-c ==0.7.0.1
   - inline-c-cpp ==0.3.0.1
@@ -1129,7 +1129,7 @@ default-package-overrides:
   - ip ==1.4.1
   - ip6addr ==1.0.0
   - iproute ==1.7.7
-  - IPv6Addr ==1.1.1
+  - IPv6Addr ==1.1.2
   - ipython-kernel ==0.9.1.0
   - irc ==0.6.1.0
   - irc-client ==1.1.0.5
@@ -1186,7 +1186,7 @@ default-package-overrides:
   - language-javascript ==0.6.0.11
   - language-puppet ==1.4.2
   - lapack-ffi ==0.0.2
-  - lapack-ffi-tools ==0.1.1
+  - lapack-ffi-tools ==0.1.2
   - largeword ==1.2.5
   - latex ==0.1.0.4
   - lattices ==1.7.1.1
@@ -1194,7 +1194,7 @@ default-package-overrides:
   - lazyio ==0.1.0.4
   - lca ==0.3.1
   - leancheck ==0.8.0
-  - leancheck-instances ==0.0.2
+  - leancheck-instances ==0.0.3
   - leapseconds-announced ==2017.1.0.1
   - lens ==4.17
   - lens-action ==0.2.3
@@ -1228,7 +1228,7 @@ default-package-overrides:
   - List ==0.6.2
   - ListLike ==4.6
   - listsafe ==0.1.0.1
-  - list-t ==1.0.3
+  - list-t ==1.0.3.1
   - ListTree ==0.2.3
   - llvm-hs-pure ==7.0.0
   - lmdb ==0.2.5
@@ -1266,7 +1266,7 @@ default-package-overrides:
   - markdown ==0.1.17.4
   - markdown-unlit ==0.5.0
   - markov-chain ==0.0.3.4
-  - massiv ==0.2.6.0
+  - massiv ==0.2.7.0
   - massiv-io ==0.1.5.0
   - mathexpr ==0.3.0.0
   - math-functions ==0.3.1.0
@@ -1285,6 +1285,7 @@ default-package-overrides:
   - mega-sdist ==0.3.3.2
   - memory ==0.14.18
   - MemoTrie ==0.6.9
+  - menshen ==0.0.1
   - mercury-api ==0.1.0.2
   - merkle-tree ==0.1.1
   - mersenne-random-pure64 ==0.2.2.0
@@ -1375,7 +1376,7 @@ default-package-overrides:
   - mwc-probability-transition ==0.4
   - mwc-random ==0.14.0.0
   - mysql ==0.1.7
-  - mysql-haskell ==0.8.4.1
+  - mysql-haskell ==0.8.4.2
   - mysql-haskell-nem ==0.1.0.0
   - mysql-simple ==0.4.5
   - n2o ==0.11.1
@@ -1420,7 +1421,7 @@ default-package-overrides:
   - NoHoed ==0.1.1
   - nonce ==1.0.7
   - nondeterminism ==1.4
-  - non-empty ==0.3.0.1
+  - non-empty ==0.3.1
   - nonempty-containers ==0.1.1.0
   - nonemptymap ==0.0.6.0
   - non-empty-sequence ==0.2.0.2
@@ -1687,7 +1688,7 @@ default-package-overrides:
   - regex-tdfa ==1.2.3.1
   - regex-tdfa-text ==1.0.0.3
   - regex-with-pcre ==1.0.2.0
-  - registry ==0.1.2.2
+  - registry ==0.1.2.3
   - reinterpret-cast ==0.1.0
   - relapse ==1.0.0.0
   - relational-query ==0.12.1.0
@@ -1734,7 +1735,7 @@ default-package-overrides:
   - safe-foldable ==0.1.0.0
   - safeio ==0.0.5.0
   - SafeSemaphore ==0.10.1
-  - salak ==0.1.7
+  - salak ==0.1.8
   - saltine ==0.1.0.2
   - salve ==1.0.6
   - sample-frame ==0.0.3
@@ -1789,7 +1790,7 @@ default-package-overrides:
   - servant-foreign ==0.15
   - servant-js ==0.9.4
   - servant-JuicyPixels ==0.3.0.4
-  - servant-kotlin ==0.1.1.5
+  - servant-kotlin ==0.1.1.6
   - servant-lucid ==0.8.1
   - servant-mock ==0.8.5
   - servant-pandoc ==0.5.0.0
@@ -1829,9 +1830,9 @@ default-package-overrides:
   - signal ==0.1.0.4
   - silently ==1.2.5
   - simple-cmd ==0.1.2
-  - simple-log ==0.9.10
+  - simple-log ==0.9.11
   - simple-reflect ==0.3.3
-  - simple-sendfile ==0.2.27
+  - simple-sendfile ==0.2.28
   - simple-vec3 ==0.4.0.10
   - since ==0.0.0
   - singleton-bool ==0.1.4
@@ -1885,7 +1886,7 @@ default-package-overrides:
   - stateref ==0.3
   - statestack ==0.2.0.5
   - StateVar ==1.1.1.1
-  - static-text ==0.2.0.3
+  - static-text ==0.2.0.4
   - statistics ==0.15.0.0
   - stb-image-redux ==0.2.1.2
   - step-function ==0.2
@@ -1962,7 +1963,7 @@ default-package-overrides:
   - tardis ==0.4.1.0
   - tasty ==1.2
   - tasty-ant-xml ==1.1.5
-  - tasty-dejafu ==1.2.0.8
+  - tasty-dejafu ==1.2.1.0
   - tasty-discover ==4.2.1
   - tasty-expected-failure ==0.11.1.1
   - tasty-golden ==2.3.2
@@ -1977,7 +1978,7 @@ default-package-overrides:
   - tasty-th ==0.1.7
   - TCache ==0.12.1
   - tce-conf ==1.3
-  - tcp-streams ==1.0.1.0
+  - tcp-streams ==1.0.1.1
   - tcp-streams-openssl ==1.0.1.0
   - tdigest ==0.2.1
   - telegram-bot-simple ==0.2.0
@@ -2092,7 +2093,7 @@ default-package-overrides:
   - type-of-html ==1.5.0.0
   - type-of-html-static ==0.1.0.2
   - type-operators ==0.1.0.4
-  - typerep-map ==0.3.0
+  - typerep-map ==0.3.1
   - type-spec ==0.3.0.1
   - tz ==0.1.3.2
   - tzdata ==0.1.20181026.0
@@ -2123,7 +2124,7 @@ default-package-overrides:
   - universum ==1.5.0
   - unix-bytestring ==0.3.7.3
   - unix-compat ==0.5.1
-  - unix-time ==0.4.4
+  - unix-time ==0.4.5
   - unliftio ==0.2.10
   - unliftio-core ==0.1.2.0
   - unlit ==0.4.0.0
@@ -2181,13 +2182,13 @@ default-package-overrides:
   - vivid-supercollider ==0.4.1.2
   - void ==0.7.2
   - vty ==5.25.1
-  - wai ==3.2.1.2
+  - wai ==3.2.2
   - wai-app-static ==3.1.6.2
   - wai-cli ==0.1.1
   - wai-conduit ==3.0.0.4
   - wai-cors ==0.2.6
   - wai-eventsource ==3.0.0
-  - wai-extra ==3.0.24.3
+  - wai-extra ==3.0.25
   - wai-handler-launch ==3.0.2.4
   - wai-logger ==2.3.4
   - wai-middleware-auth ==0.1.2.1
@@ -2202,12 +2203,12 @@ default-package-overrides:
   - wai-slack-middleware ==0.2.0
   - wai-transformers ==0.1.0
   - wai-websockets ==3.0.1.2
-  - warp ==3.2.25
+  - warp ==3.2.26
   - warp-tls ==3.2.4.3
   - warp-tls-uid ==0.2.0.5
   - wave ==0.1.5
   - wcwidth ==0.0.2
-  - web3 ==0.8.3.0
+  - web3 ==0.8.3.1
   - webdriver ==0.8.5
   - webex-teams-api ==0.2.0.0
   - webex-teams-conduit ==0.2.0.0
@@ -2247,7 +2248,7 @@ default-package-overrides:
   - writer-cps-mtl ==0.1.1.5
   - writer-cps-transformers ==0.1.1.4
   - ws ==0.0.5
-  - wuss ==1.1.11
+  - wuss ==1.1.12
   - X11 ==1.9
   - X11-xft ==0.3.1
   - x11-xim ==0.0.9.0
@@ -2297,11 +2298,11 @@ default-package-overrides:
   - yesod-auth-hashdb ==1.7.1
   - yesod-auth-oauth2 ==0.6.1.0
   - yesod-bin ==1.6.0.3
-  - yesod-core ==1.6.9
+  - yesod-core ==1.6.10.1
   - yesod-csp ==0.2.4.0
   - yesod-eventsource ==1.6.0
   - yesod-fb ==0.5.0
-  - yesod-form ==1.6.3
+  - yesod-form ==1.6.4
   - yesod-form-bootstrap4 ==2.1.0
   - yesod-gitrepo ==0.3.0
   - yesod-gitrev ==0.2.0.0
@@ -2367,9 +2368,6 @@ extra-packages:
   - haskell-src-exts == 1.19.*          # required by hindent and structured-haskell-mode
   - hinotify == 0.3.9                   # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29
   - hoogle == 5.0.14                    # required by hie-hoogle
-  - hspec < 2.5                         # stylish-cabal-0.4.0.1: https://github.com/pikajude/stylish-cabal/issues/11
-  - hspec-core < 2.5                    # stylish-cabal-0.4.0.1: https://github.com/pikajude/stylish-cabal/issues/11
-  - hspec-discover < 2.5                # stylish-cabal-0.4.0.1: https://github.com/pikajude/stylish-cabal/issues/11
   - html-conduit ^>= 1.2                # pre-lts-11.x versions neeed by git-annex 6.20180227
   - http-conduit ^>= 2.2                # pre-lts-11.x versions neeed by git-annex 6.20180227
   - inline-c < 0.6                      # required on GHC 8.0.x
@@ -2437,7 +2435,6 @@ package-maintainers:
     - xmonad
     - xmonad-contrib
   gridaphobe:
-    - ghc-srcspan-plugin
     - located-base
   jb55:
     - bson-lens
@@ -2612,11 +2609,13 @@ dont-distribute-packages:
   accelerate-arithmetic:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-fftw:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-fourier:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  accelerate-io:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-llvm-native:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-llvm:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-random:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-typelits:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-utility:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  accelerate:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   accentuateus:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   access-time:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   access-token-provider:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2833,8 +2832,8 @@ dont-distribute-packages:
   arena:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   arff:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   arghwxhaskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  argon:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   argon2:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  argon:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   argparser:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   arguedit:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ariadne:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2863,8 +2862,8 @@ dont-distribute-packages:
   asic:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   asif:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   asil:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  asn:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   asn1-codec:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  asn:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   AspectAG:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   assert:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   assertions:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2923,6 +2922,7 @@ dont-distribute-packages:
   authoring:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   AutoForms:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   autom:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  automata:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   autonix-deps-kf5:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   autonix-deps:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   avatar-generator:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3123,6 +3123,7 @@ dont-distribute-packages:
   biopsl:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   biosff:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   biostockholm:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  birch-beer:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   bird:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   BirdPP:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   bisect-binary:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3148,6 +3149,7 @@ dont-distribute-packages:
   blakesum:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   blank-canvas:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   blas-carray:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  blas-comfort-array:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   blas-ffi:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   blas-hs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   blas:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3324,8 +3326,8 @@ dont-distribute-packages:
   cairo-appbase:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   cairo-canvas:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cairo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cake:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cake3:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cake:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cakyrespa:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cal-layout:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cal3d-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3346,6 +3348,7 @@ dont-distribute-packages:
   canteven-listen-http:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   canteven-log:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   canteven-parsedate:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cantor-pairing:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cantor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   cao:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   cap:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3402,9 +3405,9 @@ dont-distribute-packages:
   ccnx:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cctools-workqueue:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   cedict:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cef:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   cef3-raw:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   cef3-simple:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cef:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ceilometer-common:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   cellrenderer-cairo:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   celtchar:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3446,6 +3449,7 @@ dont-distribute-packages:
   chell-quickcheck:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   chell:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   chevalier-common:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  chiasma:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   chitauri:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Chitra:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   choose-exe:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3583,6 +3587,7 @@ dont-distribute-packages:
   colorless-http-client:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   colorless-scotty:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   colorless:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  colour-accelerate:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   colour-space:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   coltrane:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   columbia:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3651,6 +3656,7 @@ dont-distribute-packages:
   conductive-base:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   conductive-hsc3:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   conductive-song:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  conduit-algorithms:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   conduit-audio-lame:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   conduit-audio-samplerate:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   conduit-find:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3770,15 +3776,15 @@ dont-distribute-packages:
   cqrs-testkit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cr:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   crack:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  craft:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Craft3e:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  craft:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   craftwerk-cairo:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   craftwerk-gtk:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   craftwerk:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   crawlchain:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   craze:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  crc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   crc16:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  crc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   crdt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   creatur:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   credential-store:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3855,7 +3861,6 @@ dont-distribute-packages:
   darcs-fastconvert:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   darcs-graph:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   darcs-monitor:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  darcs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   darcs2dot:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   darcsden:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   DarcsHelpers:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3970,6 +3975,7 @@ dont-distribute-packages:
   debug-me:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   debug-trace-var:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   debug-tracy:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  debug:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   decepticons:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   decimal-arithmetic:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   decimal-literals:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4061,9 +4067,11 @@ dont-distribute-packages:
   dicom:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   dictionaries:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   dictparser:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  diet:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   diffcabal:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   difference-monoid:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   DifferenceLogic:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  differential:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   DifferentialEvolution:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   difftodo:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   digestive-bootstrap:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4366,8 +4374,8 @@ dont-distribute-packages:
   Etage-Graph:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Etage:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   EtaMOO:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  eternal:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Eternal10Seconds:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  eternal:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   eternity-timestamped:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   eternity:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Etherbunny:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4681,8 +4689,8 @@ dont-distribute-packages:
   frown:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   frp-arduino:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   frpnow-gloss:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  frpnow-gtk:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   frpnow-gtk3:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  frpnow-gtk:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   frpnow-vty:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   frpnow:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   fs-events:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4847,6 +4855,7 @@ dont-distribute-packages:
   ghc-proofs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-session:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-simple:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghc-srcspan-plugin:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-syb-utils:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-syb:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-time-alloc-prof:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4999,8 +5008,8 @@ dont-distribute-packages:
   GPipe-GLFW:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   GPipe-TextureLoad:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   GPipe:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gps:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   gps2htmlReport:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gps:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   gpx-conduit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   GPX:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   graceful:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5051,6 +5060,7 @@ dont-distribute-packages:
   grenade:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   gridbounds:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   gridland:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  grids:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   grm:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   groot:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   gross:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5081,13 +5091,13 @@ dont-distribute-packages:
   gtk-toggle-button-list:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk-toy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk-traymanager:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gtk:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk2hs-buildtools:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk2hs-hello:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk2hs-rpn:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Gtk2hsGenerics:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk3-mac-integration:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk3:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gtk:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtkglext:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   GtkGLTV:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtkimageview:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5106,9 +5116,9 @@ dont-distribute-packages:
   h-booru:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   h-gpgme:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   h-reversi:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  H:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   h2048:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   h2c:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  H:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   haar:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   habit:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hablog:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5188,6 +5198,7 @@ dont-distribute-packages:
   hakyll-shakespeare:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll-shortcode:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hal:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   halberd:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   halfs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   halipeto:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5209,8 +5220,9 @@ dont-distribute-packages:
   hans-pcap:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hans:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   haphviz:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happindicator:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hapistrano:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   happindicator3:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happindicator:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   happlets-lib-gtk:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   happlets:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   happraise:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5433,6 +5445,8 @@ dont-distribute-packages:
   hasql-cursor-query:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasql-generic:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasql-migration:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hasql-optparse-applicative:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hasql-pool:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasql-postgres-options:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasql-postgres:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasql-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5621,6 +5635,7 @@ dont-distribute-packages:
   hierarchical-clustering-diagrams:               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hierarchical-clustering:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hierarchical-exceptions:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hierarchical-spectral-clustering:               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hierarchy:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hiernotify:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hieroglyph:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5712,6 +5727,7 @@ dont-distribute-packages:
   hmenu:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmk:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmm-hmatrix:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hmm-lapack:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HMM:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmm:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hMollom:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5725,8 +5741,8 @@ dont-distribute-packages:
   HNM:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hnormalise:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ho-rewriting:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hoauth:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoauth2:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hoauth:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hob:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hobbes:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hobbits:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5734,6 +5750,7 @@ dont-distribute-packages:
   hocker:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hodatime:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   HODE:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Hoed:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hog:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hogg:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoggl:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5753,8 +5770,8 @@ dont-distribute-packages:
   honi:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoobuddy:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hood-off:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hood:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hood2:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hood:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoodie:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoodle-builder:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoodle-core:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5820,6 +5837,7 @@ dont-distribute-packages:
   hpygments:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpylos:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpyrg:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hpython:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hquantlib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hR:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hranker:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6082,6 +6100,7 @@ dont-distribute-packages:
   hw-excess:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hw-ip:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hw-json-lens:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-json-simd:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hw-json:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hw-packed-vector:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hw-parser:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6271,9 +6290,9 @@ dont-distribute-packages:
   iostring:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   iothread:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   iotransaction:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ip:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   ip2location:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ip2proxy:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ip:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   ipatch:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ipc:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   ipopt-hs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6459,6 +6478,7 @@ dont-distribute-packages:
   katip-syslog:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   katt:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   kawaii:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  kazura-queue:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   kd-tree:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   kdesrc-build-extra:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   kdt:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6579,8 +6599,8 @@ dont-distribute-packages:
   language-java-classfile:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-kort:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-lua-qq:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  language-lua:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-lua2:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  language-lua:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-mixal:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-ninja:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-oberon:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6644,6 +6664,7 @@ dont-distribute-packages:
   legion:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   leksah-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   lendingclub:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lens-accelerate:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   lens-prelude:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   lens-text-encoding:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   lens-time:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6704,6 +6725,7 @@ dont-distribute-packages:
   linda:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   linden:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   line:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  linear-accelerate:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   linear-algebra-cblas:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   linear-circuit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   linear-code:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6792,8 +6814,8 @@ dont-distribute-packages:
   log-postgres:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   log-utils:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   log-warper:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  log:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   log2json:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  log:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   logentries:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   logger:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   logging-effect-extra-file:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6870,6 +6892,7 @@ dont-distribute-packages:
   machines-amazonka:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   machines-process:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   machines-zlib:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  maclight:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   macos-corelibs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   macosx-make-standalone:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   madlang:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6978,8 +7001,8 @@ dont-distribute-packages:
   mediabus-rtp:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   mediabus:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   median-stream:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mediawiki:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   mediawiki2latex:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mediawiki:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   medium-sdk-haskell:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   mellon-core:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   mellon-gpio:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7082,6 +7105,7 @@ dont-distribute-packages:
   modular-prelude-classy:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   modular-prelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   modular:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  modularity:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   module-management:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   modulespection:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   modulo:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7094,6 +7118,7 @@ dont-distribute-packages:
   monad-atom-simple:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-atom:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-codec:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monad-dijkstra:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-exception:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-fork:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-http:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7163,6 +7188,9 @@ dont-distribute-packages:
   morfette:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   morfeusz:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   morph:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  morphisms-functors-inventory:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  morphisms-functors:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  morphisms-objects:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   morte:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   mosaico-lib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   moto-postgresql:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7238,8 +7266,8 @@ dont-distribute-packages:
   music-suite:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   music-util:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   musicbrainz-email:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  musicxml:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   musicxml2:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  musicxml:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   mustache-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   mutable-iter:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   MutationOrder:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7248,6 +7276,7 @@ dont-distribute-packages:
   mvc-updates:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   mvc:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   mvclient:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mwc-random-accelerate:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   mxnet-dataiter:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   mxnet-examples:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   mxnet-nn:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7330,6 +7359,7 @@ dont-distribute-packages:
   network-address:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-anonymous-i2p:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-api-support:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  network-bsd:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-builder:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-bytestring:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-connection:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7805,8 +7835,8 @@ dont-distribute-packages:
   plist-buddy:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   plocketed:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   plot-gtk-ui:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  plot-gtk:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   plot-gtk3:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  plot-gtk:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Plot-ho-matic:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   plot-lab:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   plot-light-examples:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7869,6 +7899,7 @@ dont-distribute-packages:
   postgres-tmp:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgres-websockets:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-copy-escape:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  postgresql-lo-stream:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-named:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-orm:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-query:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7887,6 +7918,7 @@ dont-distribute-packages:
   postmark:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   potato-tool:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   potoki-cereal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  potoki-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   potoki-core:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   potoki-hasql:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   potoki-zlib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8066,6 +8098,7 @@ dont-distribute-packages:
   QuickAnnotate:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickbooks:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-arbitrary-template:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  quickcheck-classes:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-poly:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-property-comb:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-property-monad:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8156,8 +8189,9 @@ dont-distribute-packages:
   razom-text-util:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   rbr:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   rc:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rdf:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rcu:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   rdf4h:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rdf:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   rdioh:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   react-flux-servant:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   react-flux:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8169,8 +8203,8 @@ dont-distribute-packages:
   reactive-banana-automation:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-banana-bunch:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-banana-gi-gtk:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reactive-banana-sdl:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-banana-sdl2:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reactive-banana-sdl:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-banana-threepenny:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-banana-wx:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-banana:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8188,6 +8222,7 @@ dont-distribute-packages:
   really-simple-xml-parser:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   reasonable-lens:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   record-aeson:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  record-encode:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   record-gl:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   record-preprocessor:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   record-syntax:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8374,6 +8409,7 @@ dont-distribute-packages:
   rollbar-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   roller:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   RollingDirectory:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ron:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   rope:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   rose-trees:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   rose-trie:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8582,6 +8618,7 @@ dont-distribute-packages:
   servant-auth-token:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-checked-exceptions-core:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-checked-exceptions:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-client-namedargs:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-client:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-conduit:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-csharp:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8603,6 +8640,7 @@ dont-distribute-packages:
   servant-machines:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-matrix-param:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-multipart:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-namedargs:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-nix:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-pandoc:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-pipes:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8616,6 +8654,7 @@ dont-distribute-packages:
   servant-rawm:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-router:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-scotty:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-server-namedargs:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-smsc-ru:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-snap:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-streaming-client:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8807,10 +8846,10 @@ dont-distribute-packages:
   Smooth:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   smsaero:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   smt-lib:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SmtLib:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   smtlib2-debug:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   smtlib2-pipe:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   smtlib2-quickcheck:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SmtLib:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   smtp-mail-ng:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   SMTPClient:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   smtps-gmail:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8891,6 +8930,7 @@ dont-distribute-packages:
   socket-unix:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   socketed:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   socketio:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sockets:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   socketson:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   sodium:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   soegtk:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8927,6 +8967,7 @@ dont-distribute-packages:
   special-keys:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   specialize-th:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   species:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  spectral-clustering:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   speculation-transformers:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   speculation:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   speechmatics:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9004,8 +9045,8 @@ dont-distribute-packages:
   stackage-to-hackage:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage-types:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage-upload:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stackage:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage2nix:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stackage:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   standalone-derive-topdown:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   standalone-haddock:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   starling:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9219,8 +9260,8 @@ dont-distribute-packages:
   tagsoup-megaparsec:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   tagsoup-parsec:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   tagsoup-selection:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tai:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   tai64:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tai:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   takahashi:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   takusen-oracle:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Takusen:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9289,6 +9330,7 @@ dont-distribute-packages:
   termbox-banana:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   termbox-bindings:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   termcolor:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  terminal-punch:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   terminal-text:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   termination-combinators:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   termonad:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9370,13 +9412,14 @@ dont-distribute-packages:
   threadscope:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   threepenny-gui-contextmenu:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   threepenny-gui-flexbox:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  thrift:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   throttled-io-loop:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   through-text:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   thumbnail-plus:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   tic-tac-toe:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tickle:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  TicTacToe:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tictactoe3d:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  TicTacToe:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tidal-midi:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   tidal-serial:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   tidal-vis:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9441,6 +9484,8 @@ dont-distribute-packages:
   tomato-rubato-openal:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   toml:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   tomland:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tonatona-google-server-api:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  too-many-cells:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   toodles:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Top:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   top:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9583,6 +9628,7 @@ dont-distribute-packages:
   type-sub-th:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   typeable-th:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   TypeClass:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  typed-admin:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   typed-spreadsheet:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   typed-streams:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   typed-wire:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9739,6 +9785,7 @@ dont-distribute-packages:
   vault-trans:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   vaultaire-common:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   vaultenv:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vaultenv:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   vcard:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   vcatt:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   vcf:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9995,6 +10042,7 @@ dont-distribute-packages:
   X11-xdamage:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   X11-xfixes:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   x86-64bit:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xattr:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   xcb-types:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   xchat-plugin:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   xcp:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -10037,9 +10085,9 @@ dont-distribute-packages:
   XmlHtmlWriter:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   XMLParser:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmltv:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  XMMS:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmms2-client-glib:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmms2-client:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  XMMS:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmonad-bluetilebranch:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmonad-contrib-bluetilebranch:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmonad-contrib-gpl:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -10072,6 +10120,7 @@ dont-distribute-packages:
   yajl-enumerator:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   yajl:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   yak:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yam-datasource:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   yam-job:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   yam-servant:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   yam-transaction-odbc:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -10088,8 +10137,8 @@ dont-distribute-packages:
   yampa-glut:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   yampa-sdl2:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   yampa-test:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Yampa:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   yampa2048:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Yampa:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   YampaSynth:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   yandex-translate:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   yaop:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -10099,6 +10148,8 @@ dont-distribute-packages:
   yarr:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   yate:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   yavie:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yaya-unsafe:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yaya:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   ycextra:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   yeller:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   yeshql-postgresql-simple:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 6fdb2fd5494..46c8c3f9f5b 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -553,4 +553,7 @@ self: super: builtins.intersectAttrs super {
   # Avoid infitite recursion with yaya.
   yaya-hedgehog = super.yaya-hedgehog.override { yaya = dontCheck self.yaya; };
 
+  # Avoid infitite recursion with tonatona.
+  tonaparser = dontCheck super.tonaparser;
+
 }
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 77bde5c85b7..2a71e7e92d1 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -391,7 +391,7 @@ stdenv.mkDerivation ({
         rmdir "$packageConfFile"
       fi
       for packageConfFile in "$packageConfDir/"*; do
-        local pkgId=$( ${gnused}/bin/sed -n -e 's|^id: ||p' $packageConfFile )
+        local pkgId=$( ${gnused}/bin/sed -n -e 's|^id:[ ]\+||p' $packageConfFile )
         mv $packageConfFile $packageConfDir/$pkgId.conf
       done
 
diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix
index 2afe270e0fc..184d45eda44 100644
--- a/pkgs/development/haskell-modules/generic-stack-builder.nix
+++ b/pkgs/development/haskell-modules/generic-stack-builder.nix
@@ -1,6 +1,5 @@
-{ stdenv, ghc, pkgconfig, glibcLocales, cacert, stack }@depArgs:
-
-with stdenv.lib;
+{ stdenv, ghc, pkgconfig, glibcLocales
+, cacert, stack, makeSetupHook, lib }@depArgs:
 
 { buildInputs ? []
 , extraArgs ? []
@@ -10,34 +9,27 @@ with stdenv.lib;
 , ...
 }@args:
 
-let stackCmd = "stack --internal-re-exec-version=${stack.version}";
-
-    # Add all dependencies in buildInputs including propagated ones to
-    # STACK_IN_NIX_EXTRA_ARGS.
-    addStackArgsHook = ''
-for pkg in ''${pkgsHostHost[@]} ''${pkgsHostBuild[@]} ''${pkgsHostTarget[@]}
-do
-  [ -d "$pkg/lib" ] && \
-    export STACK_IN_NIX_EXTRA_ARGS+=" --extra-lib-dirs=$pkg/lib"
-  [ -d "$pkg/include" ] && \
-    export STACK_IN_NIX_EXTRA_ARGS+=" --extra-include-dirs=$pkg/include"
-done
-    '';
+let
+
+  stackCmd = "stack --internal-re-exec-version=${stack.version}";
+
+  # Add all dependencies in buildInputs including propagated ones to
+  # STACK_IN_NIX_EXTRA_ARGS.
+  stackHook = makeSetupHook {} ./stack-hook.sh;
+
 in stdenv.mkDerivation (args // {
 
-  buildInputs =
-    buildInputs ++
-    optional (stdenv.hostPlatform.libc == "glibc") glibcLocales ++
-    [ ghc pkgconfig stack ];
+  buildInputs = buildInputs
+    ++ lib.optional (stdenv.hostPlatform.libc == "glibc") glibcLocales;
 
-  STACK_PLATFORM_VARIANT="nix";
-  STACK_IN_NIX_SHELL=1;
-  STACK_IN_NIX_EXTRA_ARGS = extraArgs;
-  shellHook = addStackArgsHook + args.shellHook or "";
+  nativeBuildInputs = [ ghc pkgconfig stack stackHook ];
 
+  STACK_PLATFORM_VARIANT = "nix";
+  STACK_IN_NIX_SHELL = 1;
+  STACK_IN_NIX_EXTRA_ARGS = extraArgs;
 
   # XXX: workaround for https://ghc.haskell.org/trac/ghc/ticket/11042.
-  LD_LIBRARY_PATH = makeLibraryPath (LD_LIBRARY_PATH ++ buildInputs);
+  LD_LIBRARY_PATH = lib.makeLibraryPath (LD_LIBRARY_PATH ++ buildInputs);
                     # ^^^ Internally uses `getOutput "lib"` (equiv. to getLib)
 
   # Non-NixOS git needs cert
@@ -48,18 +40,33 @@ in stdenv.mkDerivation (args // {
 
   preferLocalBuild = true;
 
-  configurePhase = args.configurePhase or ''
+  preConfigure = ''
     export STACK_ROOT=$NIX_BUILD_TOP/.stack
-    ${addStackArgsHook}
   '';
 
-  buildPhase = args.buildPhase or "${stackCmd} build";
+  buildPhase = args.buildPhase or ''
+    runHook preBuild
+
+    ${stackCmd} build
+
+    runHook postBuild
+  '';
+
+  checkPhase = args.checkPhase or ''
+    runHook preCheck
 
-  checkPhase = args.checkPhase or "${stackCmd} test";
+    ${stackCmd} test
+
+    runHook postCheck
+  '';
 
   doCheck = args.doCheck or true;
 
   installPhase = args.installPhase or ''
+    runHook preInstall
+
     ${stackCmd} --local-bin-path=$out/bin build --copy-bins
+
+    runHook postInstall
   '';
 })
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 16a413a03f1..f42742903a9 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -9702,6 +9702,7 @@ self: {
        testHaskellDepends = [ base process QuickCheck ];
        description = "Lightweight algorithmic debugging";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HoleyMonoid" = callPackage
@@ -9964,22 +9965,6 @@ self: {
     ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }:
      mkDerivation {
        pname = "HsOpenSSL";
-       version = "0.11.4.15";
-       sha256 = "0idmak6d8mpbxphyq9hkxkmby2wnzhc1phywlgm0zw6q47pwxgff";
-       revision = "1";
-       editedCabalFile = "0bkcw2pjfgv1bhgkrpncvwq9czfr7cr4ak14n0v8c2y33i33wk5z";
-       setupHaskellDepends = [ base Cabal ];
-       libraryHaskellDepends = [ base bytestring network time ];
-       librarySystemDepends = [ openssl ];
-       testHaskellDepends = [ base bytestring ];
-       description = "Partial OpenSSL binding for Haskell";
-       license = stdenv.lib.licenses.publicDomain;
-     }) {inherit (pkgs) openssl;};
-
-  "HsOpenSSL_0_11_4_16" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }:
-     mkDerivation {
-       pname = "HsOpenSSL";
        version = "0.11.4.16";
        sha256 = "1jbbrhbvl3y1l0g1wv5h7l59bj7w8ajl8bfpxfwjypgmqlrlks19";
        revision = "1";
@@ -9990,7 +9975,6 @@ self: {
        testHaskellDepends = [ base bytestring ];
        description = "Partial OpenSSL binding for Haskell";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openssl;};
 
   "HsOpenSSL-x509-system" = callPackage
@@ -10083,6 +10067,20 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "HsYAML-aeson" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, HsYAML, mtl, text, vector
+     }:
+     mkDerivation {
+       pname = "HsYAML-aeson";
+       version = "0.1.0.0";
+       sha256 = "1hf1gwa89ghd4aaim6g8dx9wppp6d1y0w1xiddm1r8lpfidca1nw";
+       libraryHaskellDepends = [
+         aeson base bytestring HsYAML mtl text vector
+       ];
+       description = "JSON to YAML Adapter";
+       license = stdenv.lib.licenses.gpl2Plus;
+     }) {};
+
   "Hsed" = callPackage
     ({ mkDerivation, array, base, bytestring, cmdargs, data-accessor
      , data-accessor-template, data-accessor-transformers, directory
@@ -10294,24 +10292,6 @@ self: {
      }:
      mkDerivation {
        pname = "IPv6Addr";
-       version = "1.1.1";
-       sha256 = "0l2yfn46xyv0ib30k0kmhw3vl4vfmziqinhbynpi4yrmy6lmj29v";
-       libraryHaskellDepends = [
-         aeson attoparsec base iproute network network-info random text
-       ];
-       testHaskellDepends = [
-         base HUnit test-framework test-framework-hunit text
-       ];
-       description = "Library to deal with IPv6 address text representations";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "IPv6Addr_1_1_2" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, HUnit, iproute, network
-     , network-info, random, test-framework, test-framework-hunit, text
-     }:
-     mkDerivation {
-       pname = "IPv6Addr";
        version = "1.1.2";
        sha256 = "0zpjji441ys2x6zmndyg7203w3j4j8flhwrl4593a6bz6vqzkwwb";
        libraryHaskellDepends = [
@@ -10322,7 +10302,6 @@ self: {
        ];
        description = "Library to deal with IPv6 address text representations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "IPv6DB" = callPackage
@@ -12564,18 +12543,12 @@ self: {
      }) {};
 
   "MonadCompose" = callPackage
-    ({ mkDerivation, base, data-default, ghc-prim, kan-extensions
-     , mmorph, monad-products, mtl, parallel, random, transformers
-     , transformers-compat
-     }:
+    ({ mkDerivation, base, free, mmorph, mtl, transformers }:
      mkDerivation {
        pname = "MonadCompose";
-       version = "0.8.4.2";
-       sha256 = "0y5cigcf6xian619qdnnvs9m5rzqy7n3yhz133ws54im9qzsdhvi";
-       libraryHaskellDepends = [
-         base data-default ghc-prim kan-extensions mmorph monad-products mtl
-         parallel random transformers transformers-compat
-       ];
+       version = "0.9.0.0";
+       sha256 = "1jq8ms16karqqa6qxp4n24f2v4bcc8n8mzfjm6b6q3n8hg7dj8yd";
+       libraryHaskellDepends = [ base free mmorph mtl transformers ];
        description = "Methods for composing monads";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -16336,6 +16309,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "SVGFonts_1_7_0_1" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-markup, blaze-svg
+     , bytestring, cereal, cereal-vector, containers, data-default-class
+     , diagrams-core, diagrams-lib, directory, parsec, split, text
+     , vector, xml
+     }:
+     mkDerivation {
+       pname = "SVGFonts";
+       version = "1.7.0.1";
+       sha256 = "06vnpkkr19s9b1wjp7l2w29vr7fsghcrffd2knlxvdhjacrfpc9h";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         attoparsec base blaze-markup blaze-svg bytestring cereal
+         cereal-vector containers data-default-class diagrams-core
+         diagrams-lib directory parsec split text vector xml
+       ];
+       description = "Fonts from the SVG-Font format";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "SVGPath" = callPackage
     ({ mkDerivation, base, parsec }:
      mkDerivation {
@@ -16530,8 +16524,10 @@ self: {
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
        pname = "SecureHash-SHA3";
-       version = "0.1.0.2";
-       sha256 = "0h0mya8bk7zkq92plihzzqd7svfqdk2dphnivfb0r80iw3678nv9";
+       version = "0.1.1.0";
+       sha256 = "0dva3bzfzyzh8kxljyipd041a2w1zhxjvxmhnw2mlv2jcywnk2hz";
+       revision = "1";
+       editedCabalFile = "034vwq9cfqjj6hj2nf5g8n2p5gsxpdgp6gwgsmi40klracl5ps5s";
        libraryHaskellDepends = [ base bytestring ];
        description = "simple static linked SHA3 using private symbols and the ref impl";
        license = stdenv.lib.licenses.bsd2;
@@ -20184,6 +20180,7 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "An embedded language for accelerated array processing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "accelerate-arithmetic" = callPackage
@@ -20477,6 +20474,7 @@ self: {
        ];
        description = "Read and write Accelerate arrays in various formats";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "accelerate-llvm" = callPackage
@@ -22007,18 +22005,18 @@ self: {
      }) {};
 
   "aeson-filthy" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, doctest, text
+    ({ mkDerivation, aeson, base, bytestring, doctest, text, time
      , unordered-containers
      }:
      mkDerivation {
        pname = "aeson-filthy";
-       version = "0.1.2";
-       sha256 = "1sph4iq87vl66rbxvhhh5j699yskpb8zs1mvc3nvp60nyg1145b8";
+       version = "0.1.3";
+       sha256 = "121ygm5k9qjizwjj7w5dklxs5sv0zysrnpvwb37ar4bjkcxhs0ap";
        libraryHaskellDepends = [
-         aeson base bytestring text unordered-containers
+         aeson base bytestring text time unordered-containers
        ];
        testHaskellDepends = [
-         aeson base bytestring doctest text unordered-containers
+         aeson base bytestring doctest text time unordered-containers
        ];
        description = "Several newtypes and combinators for dealing with less-than-cleanly JSON input";
        license = stdenv.lib.licenses.bsd3;
@@ -22075,13 +22073,20 @@ self: {
      }) {};
 
   "aeson-gadt-th" = callPackage
-    ({ mkDerivation, aeson, base, dependent-sum, template-haskell }:
+    ({ mkDerivation, aeson, base, dependent-sum, markdown-unlit
+     , template-haskell, transformers
+     }:
      mkDerivation {
        pname = "aeson-gadt-th";
-       version = "0.1.1.0";
-       sha256 = "1s3458ijiigkf1id53w24p1q71flpcd7acnqj4zb03fw6qm60f1v";
+       version = "0.1.2.0";
+       sha256 = "1rlcf37qb16cxrym9f0p1spmwplf521hkvdc4kl5af7q573dahkg";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
-         aeson base dependent-sum template-haskell
+         aeson base dependent-sum template-haskell transformers
+       ];
+       executableHaskellDepends = [
+         aeson base dependent-sum markdown-unlit
        ];
        description = "Derivation of Aeson instances for GADTs";
        license = stdenv.lib.licenses.bsd3;
@@ -22494,17 +22499,16 @@ self: {
      }) {};
 
   "aeson-value-parser" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, foldl, json-pointer
-     , json-pointer-aeson, mtl, scientific, text, transformers
-     , unordered-containers, vector
+    ({ mkDerivation, aeson, base, bytestring, mtl, scientific, text
+     , transformers, unordered-containers, vector
      }:
      mkDerivation {
        pname = "aeson-value-parser";
-       version = "0.13";
-       sha256 = "0iindqkzlfjdhns7nj8dpmsiq91pm19nd8cr3if1qf0zvjj0nx5q";
+       version = "0.14.3";
+       sha256 = "1ikj4kdd9qs50a5zqfhmw0f6k6b8pi9w78nk6r1vpm352xs3vsi1";
        libraryHaskellDepends = [
-         aeson base bytestring foldl json-pointer json-pointer-aeson mtl
-         scientific text transformers unordered-containers vector
+         aeson base bytestring mtl scientific text transformers
+         unordered-containers vector
        ];
        description = "An API for parsing \"aeson\" JSON tree into Haskell types";
        license = stdenv.lib.licenses.mit;
@@ -27066,6 +27070,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ansi-terminal_0_9" = callPackage
+    ({ mkDerivation, base, colour }:
+     mkDerivation {
+       pname = "ansi-terminal";
+       version = "0.9";
+       sha256 = "00xcq21rp0y8248pwik9rlrfb2m8c27aasla37zdg741yb0c4mfp";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base colour ];
+       description = "Simple ANSI terminal support, with Windows compatibility";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ansi-terminal-game" = callPackage
     ({ mkDerivation, ansi-terminal, array, base, bytestring, cereal
      , clock, hspec, linebreak, split, terminal-size, timers-tick
@@ -27092,6 +27110,8 @@ self: {
        pname = "ansi-wl-pprint";
        version = "0.6.8.2";
        sha256 = "0gnb4mkqryv08vncxnj0bzwcnd749613yw3cxfzw6y3nsldp4c56";
+       revision = "1";
+       editedCabalFile = "00b704rygy4ap540jj3ry7cgiqwwi5zx9nhj7c3905m6n6v3in88";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ ansi-terminal base ];
@@ -31435,6 +31455,7 @@ self: {
        ];
        description = "automata";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "automitive-cse" = callPackage
@@ -36796,6 +36817,7 @@ self: {
        ];
        description = "Plot a colorful tree";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bird" = callPackage
@@ -37848,6 +37870,7 @@ self: {
        ];
        description = "Auto-generated interface to Fortran BLAS via comfort-array";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blas-ffi" = callPackage
@@ -40355,6 +40378,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "buffon-machines" = callPackage
+    ({ mkDerivation, base, multiset, random, template-haskell }:
+     mkDerivation {
+       pname = "buffon-machines";
+       version = "1.0.0.0";
+       sha256 = "0s8gfbfilvnhkyjs94fb7s0amcar3nvhjb5lx1gzqgbxdgs1grdy";
+       libraryHaskellDepends = [ base multiset random template-haskell ];
+       description = "Perfect simulation of discrete random variables";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "bug" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -40795,6 +40829,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bv-embed" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "bv-embed";
+       version = "0.1.0";
+       sha256 = "0afywcb7n2h2vycxg47myaqz49xrlnjpyq753smildjlkl79jx79";
+       libraryHaskellDepends = [ base ];
+       description = "Define embeddings of small bit vectors into larger ones";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "bv-little" = callPackage
     ({ mkDerivation, base, criterion, deepseq, hashable, integer-gmp
      , mono-traversable, primitive, QuickCheck, tasty, tasty-hunit
@@ -41661,6 +41706,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ca-province-codes" = callPackage
+    ({ mkDerivation, aeson, base, hspec, QuickCheck, text }:
+     mkDerivation {
+       pname = "ca-province-codes";
+       version = "1.0.0.0";
+       sha256 = "1lhmmqn83v9bflm4x2nqbxx6pjh393id29syglinaqal4dvl5qq3";
+       libraryHaskellDepends = [ aeson base text ];
+       testHaskellDepends = [ aeson base hspec QuickCheck text ];
+       description = "ISO 3166-2:CA Province Codes and Names";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "cab" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, Cabal, conduit
      , conduit-extra, containers, directory, filepath, process
@@ -42219,6 +42276,8 @@ self: {
        pname = "cabal-plan";
        version = "0.5.0.0";
        sha256 = "1vfa4lwfjhv4nyl1rwm7i99zdkwriighlhfcz0rgjwzgg56wrihq";
+       revision = "1";
+       editedCabalFile = "0nnh6qq36cpfwzqrv1i1cn93n6n32nbl6ddp0y22jmmxnx9xsrvp";
        configureFlags = [ "-fexe" ];
        isLibrary = true;
        isExecutable = true;
@@ -42231,7 +42290,7 @@ self: {
          optparse-applicative parsec text vector
        ];
        doHaddock = false;
-       description = "Library and utiltity for processing cabal's plan.json file";
+       description = "Library and utility for processing cabal's plan.json file";
        license = "GPL-2.0-or-later AND BSD-3-Clause";
      }) {};
 
@@ -43482,17 +43541,20 @@ self: {
 
   "cantor-pairing" = callPackage
     ({ mkDerivation, arithmoi, base, containers, hspec, hspec-discover
-     , integer-gmp
+     , integer-gmp, integer-logarithms, mtl
      }:
      mkDerivation {
        pname = "cantor-pairing";
-       version = "0.1.0.0";
-       sha256 = "110iq8fldw4rk46lxq1b78mfpbp5dxcjc2vg89996j95xd88xkjp";
-       libraryHaskellDepends = [ arithmoi base containers integer-gmp ];
-       testHaskellDepends = [ base hspec ];
+       version = "0.1.1.0";
+       sha256 = "03vl7qd5962kr0mi4ymgmh667948rzqiq9f1ixcvycyjz8hz0yqw";
+       libraryHaskellDepends = [
+         arithmoi base containers integer-gmp integer-logarithms
+       ];
+       testHaskellDepends = [ base containers hspec mtl ];
        testToolDepends = [ hspec-discover ];
        description = "Convert data to and from a natural number representation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cao" = callPackage
@@ -43579,38 +43641,38 @@ self: {
      }) {};
 
   "capnp" = callPackage
-    ({ mkDerivation, array, base, binary, bytes, bytestring, cereal
-     , containers, cpu, data-default, data-default-instances-vector
-     , deepseq, directory, dlist, exceptions, filepath, heredoc, HUnit
-     , mtl, pretty-show, primitive, process, process-extras, QuickCheck
-     , quickcheck-instances, quickcheck-io, reinterpret-cast, resourcet
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , text, transformers, utf8-string, vector, wl-pprint-text
+    ({ mkDerivation, async, base, bytes, bytestring, containers, cpu
+     , data-default, data-default-instances-vector, deepseq, directory
+     , exceptions, filepath, focus, hashable, heredoc, hspec, list-t
+     , mtl, network, network-simple, pretty-show, primitive, process
+     , process-extras, QuickCheck, quickcheck-instances, quickcheck-io
+     , reinterpret-cast, resourcet, safe-exceptions, stm, stm-containers
+     , supervisors, text, transformers, vector, wl-pprint-text
      }:
      mkDerivation {
        pname = "capnp";
-       version = "0.3.0.0";
-       sha256 = "17i7m168bqp57m5lb04sbfh2amc1sicv2jajkl61jb1gsidwdkrz";
-       revision = "1";
-       editedCabalFile = "0faisbw98h1zjsqja57c0xac6hhnhb4sghzh9a3225pp8wxnbjr7";
+       version = "0.4.0.0";
+       sha256 = "1dzabszp3nn13rmvqmdl2gimwmkdpjzd303chbi0jw8248s14bfx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         array base bytes bytestring cpu data-default
-         data-default-instances-vector exceptions mtl primitive
-         reinterpret-cast text transformers vector
+         async base bytes bytestring containers cpu data-default
+         data-default-instances-vector exceptions focus hashable list-t mtl
+         network network-simple pretty-show primitive reinterpret-cast
+         safe-exceptions stm stm-containers supervisors text transformers
+         vector
        ];
        executableHaskellDepends = [
-         array base binary bytes bytestring cereal containers directory
-         dlist exceptions filepath mtl primitive reinterpret-cast text
-         transformers utf8-string vector wl-pprint-text
+         base bytes bytestring containers data-default directory exceptions
+         filepath mtl primitive reinterpret-cast safe-exceptions text
+         transformers vector wl-pprint-text
        ];
        testHaskellDepends = [
-         array base binary bytes bytestring data-default deepseq directory
-         exceptions heredoc HUnit mtl pretty-show primitive process
-         process-extras QuickCheck quickcheck-instances quickcheck-io
-         reinterpret-cast resourcet test-framework test-framework-hunit
-         test-framework-quickcheck2 text transformers vector
+         async base bytes bytestring containers data-default deepseq
+         directory exceptions heredoc hspec mtl network network-simple
+         pretty-show primitive process process-extras QuickCheck
+         quickcheck-instances quickcheck-io reinterpret-cast resourcet
+         safe-exceptions stm supervisors text transformers vector
        ];
        description = "Cap'n Proto for Haskell";
        license = stdenv.lib.licenses.mit;
@@ -45416,8 +45478,8 @@ self: {
        pname = "cgi";
        version = "3001.3.0.3";
        sha256 = "1rml686pvjhpd51vj6g79c6132m8kx6kxikk7g246imps3bl90gb";
-       revision = "2";
-       editedCabalFile = "082i8x8j8ry2nf7m99injh18sr9llbw66ck5ylqlyvh6bhwspa6b";
+       revision = "3";
+       editedCabalFile = "06gyp3mxx9jkkbz9sbn389wjsz33s231vk53pbsm37a1z9ply14a";
        libraryHaskellDepends = [
          base bytestring containers exceptions mtl multipart network
          network-uri parsec time xhtml
@@ -45426,6 +45488,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cgi_3001_4_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, exceptions, mtl
+     , multipart, network-uri, parsec, time, xhtml
+     }:
+     mkDerivation {
+       pname = "cgi";
+       version = "3001.4.0.0";
+       sha256 = "1d0nh5ymkqskkp4yn0gfz4mff8i0cxyw1wws8xxp6k1mg1ywa25k";
+       revision = "1";
+       editedCabalFile = "0q1s49hglw0zjcqsi7ba8nminywxgn6b83xds2lfp0r12q2h00xr";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring containers exceptions mtl multipart network-uri
+         parsec time xhtml
+       ];
+       description = "A library for writing CGI programs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cgi-undecidable" = callPackage
     ({ mkDerivation, base, cgi, mtl }:
      mkDerivation {
@@ -46121,6 +46204,7 @@ self: {
        ];
        description = "tmux api";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chimera" = callPackage
@@ -48624,23 +48708,11 @@ self: {
     ({ mkDerivation, base, containers, tree-fun }:
      mkDerivation {
        pname = "clumpiness";
-       version = "0.17.0.0";
-       sha256 = "15f4js9rnn2rpkrvr9lphh624hkf4m15rdlvfwn29bvf40yk0jzx";
-       libraryHaskellDepends = [ base containers tree-fun ];
-       description = "Calculate the clumpiness of leaf properties in a tree";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "clumpiness_0_17_0_2" = callPackage
-    ({ mkDerivation, base, containers, tree-fun }:
-     mkDerivation {
-       pname = "clumpiness";
        version = "0.17.0.2";
        sha256 = "1h1n349sq2lpikpvzzarz74200b8k7dkdjpp4rpkx79xdlfc58pc";
        libraryHaskellDepends = [ base containers tree-fun ];
        description = "Calculate the clumpiness of leaf properties in a tree";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cluss" = callPackage
@@ -49903,6 +49975,7 @@ self: {
        libraryHaskellDepends = [ accelerate base ];
        description = "Working with colours in Accelerate";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "colour-space" = callPackage
@@ -51916,6 +51989,7 @@ self: {
        ];
        description = "Conduit-based algorithms";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "conduit-audio" = callPackage
@@ -53092,8 +53166,8 @@ self: {
      }:
      mkDerivation {
        pname = "constraints-extras";
-       version = "0.2.3.0";
-       sha256 = "09qa30zgh6w7k5nl1gvr18nhl5cfnnrzzlmafn9hvp8hms6837ic";
+       version = "0.2.3.1";
+       sha256 = "1invhgwvhsab9jj776aaa180xsk1cbnwygxfappasbis42l26ab9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base constraints template-haskell ];
@@ -53447,12 +53521,18 @@ self: {
      }) {};
 
   "continued-fractions" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, containers, QuickCheck, test-framework
+     , test-framework-quickcheck2
+     }:
      mkDerivation {
        pname = "continued-fractions";
-       version = "0.9.1.1";
-       sha256 = "0gqp1yazmmmdf04saa306jdsf8r5s98fll9rnm8ff6jzr87nvnnh";
+       version = "0.10.0.2";
+       sha256 = "03s1vrsps2l114b3jg8nmglbv9bwsrjv79j06lyg9pxgvhk4lcpx";
        libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base containers QuickCheck test-framework
+         test-framework-quickcheck2
+       ];
        description = "Continued fractions";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -57800,8 +57880,8 @@ self: {
      }:
      mkDerivation {
        pname = "darcs";
-       version = "2.14.1";
-       sha256 = "0dfd6bp2wy0aabxx7l93gi3dmq21j970cds424xdy1mgmjcvrpb1";
+       version = "2.14.2";
+       sha256 = "0zm2486gyhiga1amclbg92cd09bvki6vgh0ll75hv5kl72j61lb5";
        configureFlags = [ "-fforce-char8-encoding" "-flibrary" ];
        isLibrary = true;
        isExecutable = true;
@@ -57828,7 +57908,6 @@ self: {
        '';
        description = "a distributed, interactive, smart revision control system";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) curl;};
 
   "darcs-benchmark" = callPackage
@@ -59456,17 +59535,6 @@ self: {
      }) {};
 
   "data-ref" = callPackage
-    ({ mkDerivation, base, stm, transformers }:
-     mkDerivation {
-       pname = "data-ref";
-       version = "0.0.1.2";
-       sha256 = "0896wjkpk52cndlzkdr51s1rasi0n9b100058f1sb4qzl1dgcp30";
-       libraryHaskellDepends = [ base stm transformers ];
-       description = "Unify STRef and IORef in plain Haskell 98";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "data-ref_0_0_2" = callPackage
     ({ mkDerivation, base, data-accessor, stm, transformers }:
      mkDerivation {
        pname = "data-ref";
@@ -59475,7 +59543,6 @@ self: {
        libraryHaskellDepends = [ base data-accessor stm transformers ];
        description = "Unify STRef and IORef in plain Haskell 98";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-reify" = callPackage
@@ -60385,35 +60452,6 @@ self: {
      }:
      mkDerivation {
        pname = "dbus";
-       version = "1.2.1";
-       sha256 = "1mxijj32lvl6dxkpz95mxywq2hrj7krc9r8q41zbyqqx0hvc3n4r";
-       revision = "1";
-       editedCabalFile = "1n725klx5p6z63gxi18q4q4k4q0x03pxw54f22n7mbqd2i1nsg9c";
-       libraryHaskellDepends = [
-         base bytestring cereal conduit containers deepseq exceptions
-         filepath lens network parsec random split template-haskell text
-         th-lift transformers unix vector xml-conduit xml-types
-       ];
-       testHaskellDepends = [
-         base bytestring cereal containers directory extra filepath network
-         parsec process QuickCheck random resourcet tasty tasty-hunit
-         tasty-quickcheck text transformers unix vector
-       ];
-       benchmarkHaskellDepends = [ base criterion ];
-       doCheck = false;
-       description = "A client library for the D-Bus IPC system";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "dbus_1_2_3" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, conduit, containers
-     , criterion, deepseq, directory, exceptions, extra, filepath, lens
-     , network, parsec, process, QuickCheck, random, resourcet, split
-     , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text
-     , th-lift, transformers, unix, vector, xml-conduit, xml-types
-     }:
-     mkDerivation {
-       pname = "dbus";
        version = "1.2.3";
        sha256 = "04x0scjl9kyhh2wl02slfa7ykd2lmxbx6x7bp7wv8x4pwgd849zc";
        libraryHaskellDepends = [
@@ -60430,7 +60468,6 @@ self: {
        doCheck = false;
        description = "A client library for the D-Bus IPC system";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dbus-client" = callPackage
@@ -61047,6 +61084,7 @@ self: {
        ];
        description = "Simple trace-based debugger";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "debug-diff" = callPackage
@@ -62312,31 +62350,6 @@ self: {
      }:
      mkDerivation {
        pname = "deriving-compat";
-       version = "0.5.2";
-       sha256 = "0h5jfpwawp7xn9vi82zqskaypa3vypm97lz2farmmfqvnkw60mj9";
-       revision = "1";
-       editedCabalFile = "1s672vc7w96fmvr1p3fkqi9q80sn860j14545sskpxb8iz9f7sxg";
-       libraryHaskellDepends = [
-         base containers ghc-boot-th ghc-prim template-haskell
-         th-abstraction transformers transformers-compat
-       ];
-       testHaskellDepends = [
-         base base-compat base-orphans hspec QuickCheck tagged
-         template-haskell transformers transformers-compat
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Backports of GHC deriving extensions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "deriving-compat_0_5_4" = callPackage
-    ({ mkDerivation, base, base-compat, base-orphans, containers
-     , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged
-     , template-haskell, th-abstraction, transformers
-     , transformers-compat
-     }:
-     mkDerivation {
-       pname = "deriving-compat";
        version = "0.5.4";
        sha256 = "0kd76zvaj84391k9847q3zdvw5hlkdw3qwncysfbsvsh4g9glqwr";
        libraryHaskellDepends = [
@@ -62350,7 +62363,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Backports of GHC deriving extensions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "derp" = callPackage
@@ -63234,8 +63246,8 @@ self: {
        pname = "diagrams-contrib";
        version = "1.4.3";
        sha256 = "01r081rvxkb9i56iqi28zw4054nm62pf9f1szd9i0avmnxxsiyv5";
-       revision = "1";
-       editedCabalFile = "16ici9kx7cnva1ihhin5nyc1icif17yks3nwcxxzqxjjw556vpig";
+       revision = "2";
+       editedCabalFile = "0xpw4myq4n6k5lxdll1wg76m3gfymwb746x6qd48qfy3z22nrymw";
        libraryHaskellDepends = [
          base circle-packing colour containers cubicbezier data-default
          data-default-class diagrams-core diagrams-lib diagrams-solve
@@ -63796,6 +63808,7 @@ self: {
        ];
        description = "Discrete Interval Encoding Trees";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diff" = callPackage
@@ -63944,6 +63957,7 @@ self: {
        ];
        description = "Finds out whether an entity comes from different distributions (statuses)";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diffmap" = callPackage
@@ -64740,6 +64754,8 @@ self: {
        pname = "discord-haskell";
        version = "0.7.1";
        sha256 = "0cl40ph5qwpxa05q7jr67syq9dijxyzvmqzgw53wfri4800qxphn";
+       revision = "1";
+       editedCabalFile = "022rnkpy9frsn81d2m9n8r5crsjzjk679mfja5d65s5bzzg3plyj";
        libraryHaskellDepends = [
          aeson async base base64-bytestring bytestring containers
          data-default http-client iso8601-time JuicyPixels MonadRandom req
@@ -70393,22 +70409,6 @@ self: {
      }:
      mkDerivation {
        pname = "email-validate";
-       version = "2.3.2.9";
-       sha256 = "12sf380s0f78npga3x1bz9wkz82h477vvf3bvsxq69hrc7m6xb5f";
-       libraryHaskellDepends = [
-         attoparsec base bytestring template-haskell
-       ];
-       testHaskellDepends = [ base bytestring doctest hspec QuickCheck ];
-       description = "Email address validation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "email-validate_2_3_2_10" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec
-     , QuickCheck, template-haskell
-     }:
-     mkDerivation {
-       pname = "email-validate";
        version = "2.3.2.10";
        sha256 = "0wfk5dkpaw0gk4p0vwdpb24c6kz4gjx0z4am79v5c3k38gmb3rak";
        libraryHaskellDepends = [
@@ -70417,7 +70417,6 @@ self: {
        testHaskellDepends = [ base bytestring doctest hspec QuickCheck ];
        description = "Email address validation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "email-validate-json" = callPackage
@@ -76910,14 +76909,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "first-class-families_0_4_0_0" = callPackage
+  "first-class-families_0_5_0_0" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "first-class-families";
-       version = "0.4.0.0";
-       sha256 = "1hkvk4vhx8zanx7sc8a7nsz4h38nsfhr1rdn1ky1fim328fi4gx6";
-       revision = "1";
-       editedCabalFile = "1nrcbznpzbfxlk29f8q2zsn11h5zf67w84np25z9bc907d0xljiw";
+       version = "0.5.0.0";
+       sha256 = "03skw4axj6zk593zi8fwynzjyiq6s7apjqmjqv6rxpxhj17vqwpj";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "First class type families";
@@ -77491,6 +77488,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {FLAC = null;};
 
+  "flac_0_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory
+     , exceptions, filepath, FLAC, hspec, hspec-discover, mtl, temporary
+     , text, transformers, vector, wave
+     }:
+     mkDerivation {
+       pname = "flac";
+       version = "0.2.0";
+       sha256 = "03zmsnnpkk26ss8ka2l7x9gsfcmiqfyc73v7fna6sk5cwzxsb33c";
+       revision = "1";
+       editedCabalFile = "1phwdnya8bgw24a80vbw0m4pm7r67grnc6si8683jz620snnsm48";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base bytestring containers directory exceptions filepath mtl text
+         transformers vector wave
+       ];
+       librarySystemDepends = [ FLAC ];
+       testHaskellDepends = [
+         base bytestring directory filepath hspec temporary transformers
+         vector wave
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Complete high-level binding to libFLAC";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {FLAC = null;};
+
   "flac-picture" = callPackage
     ({ mkDerivation, base, bytestring, data-default-class, directory
      , flac, hspec, JuicyPixels, temporary
@@ -79021,10 +79045,8 @@ self: {
      }:
      mkDerivation {
        pname = "forma";
-       version = "1.1.0";
-       sha256 = "09f377ak1208lr8sskdga3nq47a151whd7z982pwv552w1q75p5p";
-       revision = "2";
-       editedCabalFile = "1yc9gv1rjbl4lsxscp5idfpn7jp27c38j6gm9v7isxgyaih0j4v4";
+       version = "1.1.1";
+       sha256 = "10q06yjz66h92qm0569l172v0c6mp9m3jfyakyva5v7xdqr8rvxb";
        libraryHaskellDepends = [
          aeson base containers mtl text unordered-containers
        ];
@@ -79744,8 +79766,8 @@ self: {
     ({ mkDerivation, base, free-algebras }:
      mkDerivation {
        pname = "free-category";
-       version = "0.0.1.0";
-       sha256 = "0cpcn10kbsx1xvvxvvcx5hpa0p9vhkrjf7cmzva2zpmhdj4jp5rg";
+       version = "0.0.2.0";
+       sha256 = "16gs7n3gl5whda376j87qm9jfdx6zhmnyp43fjfaj6s5y2s0z53z";
        libraryHaskellDepends = [ base free-algebras ];
        description = "Free category";
        license = stdenv.lib.licenses.mpl20;
@@ -84849,7 +84871,7 @@ self: {
        libraryHaskellDepends = [ array base containers ghc hpc ];
        description = "Generic GHC Plugin for annotating Haskell code with source location data";
        license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ gridaphobe ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-syb" = callPackage
@@ -86526,20 +86548,20 @@ self: {
      }) {};
 
   "git" = callPackage
-    ({ mkDerivation, base, basement, byteable, bytedump, bytestring
-     , containers, cryptonite, hourglass, memory, patience, random
-     , system-fileio, system-filepath, tasty, tasty-quickcheck
-     , unix-compat, utf8-string, vector, zlib, zlib-bindings
+    ({ mkDerivation, base, basement, bytedump, bytestring, containers
+     , cryptonite, hourglass, memory, random, system-fileio
+     , system-filepath, tasty, tasty-quickcheck, unix-compat
+     , utf8-string, vector, zlib, zlib-bindings
      }:
      mkDerivation {
        pname = "git";
-       version = "0.2.2";
-       sha256 = "18sn3rvmrqw8xy7xaqpv82inqj981z79sm6h1aw4jvvzsf6llzwa";
+       version = "0.3.0";
+       sha256 = "0kd35qnxv2vnfaaq13dbf734jq11p05v6sdbxf91pag49817b6bz";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         base basement byteable bytestring containers cryptonite hourglass
-         memory patience random system-fileio system-filepath unix-compat
-         utf8-string vector zlib zlib-bindings
+         base basement bytestring containers cryptonite hourglass memory
+         random system-fileio system-filepath unix-compat utf8-string vector
+         zlib zlib-bindings
        ];
        testHaskellDepends = [
          base bytedump bytestring hourglass tasty tasty-quickcheck
@@ -87647,26 +87669,6 @@ self: {
      }:
      mkDerivation {
        pname = "glabrous";
-       version = "1.0.0";
-       sha256 = "00q07675lrsniwrzb85bz2b5n8llbhyp0zxkscm9yr8mlirasr3k";
-       libraryHaskellDepends = [
-         aeson aeson-pretty attoparsec base bytestring cereal cereal-text
-         either text unordered-containers
-       ];
-       testHaskellDepends = [
-         base directory either hspec text unordered-containers
-       ];
-       description = "A template DSL library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "glabrous_1_0_1" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
-     , cereal, cereal-text, directory, either, hspec, text
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "glabrous";
        version = "1.0.1";
        sha256 = "11s7fhlv3aq80h20jf2l447bmxy95dy7dqvzqfp0myy4hgsasks3";
        libraryHaskellDepends = [
@@ -87678,7 +87680,6 @@ self: {
        ];
        description = "A template DSL library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "glade" = callPackage
@@ -91410,8 +91411,8 @@ self: {
      }:
      mkDerivation {
        pname = "graph-wrapper";
-       version = "0.2.5.2";
-       sha256 = "1kcdfr1bz2ks71gapz6wrzv7sj6qbmj1zadj1cmh39g9xvqjx94q";
+       version = "0.2.6.0";
+       sha256 = "19jvr7d1kkyh4qdscljbgqnlpv6rr7fsn3h9dm3bji3dgbsdd7mq";
        libraryHaskellDepends = [ array base containers ];
        testHaskellDepends = [
          array base containers deepseq hspec QuickCheck
@@ -92101,6 +92102,7 @@ self: {
          vector
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "grm" = callPackage
@@ -92806,7 +92808,7 @@ self: {
        description = "Bindings for the Gtk/OS X integration library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {gtk-mac-integration-gtk2 = null;};
+     }) {inherit (pkgs) gtk-mac-integration-gtk2;};
 
   "gtk-serialized-event" = callPackage
     ({ mkDerivation, array, base, containers, glib, gtk, gtk2
@@ -93214,23 +93216,11 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "guarded-allocation";
-       version = "0.0";
-       sha256 = "1fj8zf9drvkd8bydiy7g0z9dqqjn7d8mf1jdhwcyx6c013ixnmsj";
-       libraryHaskellDepends = [ base ];
-       description = "Memory allocation with added stress tests and integrity checks";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "guarded-allocation_0_0_1" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "guarded-allocation";
        version = "0.0.1";
        sha256 = "15a6g0bkjf9r0zl7x61ip05kb7k4rf7yxr7z8jybs5q8g78i1b0c";
        libraryHaskellDepends = [ base ];
        description = "Memory allocation with added stress tests and integrity checks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "guarded-rewriting" = callPackage
@@ -95804,6 +95794,8 @@ self: {
        pname = "hakyll-images";
        version = "0.4.2";
        sha256 = "0la1c25jlqw0y0zfcskkj4mlmkpamr2psqfnsrgz52zvmhy2ha2p";
+       revision = "1";
+       editedCabalFile = "1kmvb0cxvphmx0f1bgjq636yga58n4g2lqrg2xg5xfpwf8r956qf";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary bytestring hakyll JuicyPixels JuicyPixels-extra
@@ -95913,6 +95905,7 @@ self: {
        ];
        description = "A runtime environment for Haskell applications running on AWS Lambda";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "halberd" = callPackage
@@ -96551,35 +96544,6 @@ self: {
      }:
      mkDerivation {
        pname = "hapistrano";
-       version = "0.3.9.0";
-       sha256 = "11b4aq2qpjnsvzcir9sldv4qpccipfffvcf4q8z6ji84hyf3zb3y";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson base filepath formatting gitrev mtl path process stm time
-         transformers typed-process
-       ];
-       executableHaskellDepends = [
-         aeson async base formatting gitrev optparse-applicative path
-         path-io stm yaml
-       ];
-       testHaskellDepends = [
-         base directory filepath hspec mtl path path-io process QuickCheck
-         silently temporary
-       ];
-       description = "A deployment library for Haskell applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hapistrano_0_3_9_1" = callPackage
-    ({ mkDerivation, aeson, async, base, directory, filepath
-     , formatting, gitrev, hspec, mtl, optparse-applicative, path
-     , path-io, process, QuickCheck, silently, stm, temporary, time
-     , transformers, typed-process, yaml
-     }:
-     mkDerivation {
-       pname = "hapistrano";
        version = "0.3.9.1";
        sha256 = "0s2xhisyjx3d9rgzqcc09l2x3a8fkc5d7rdcrrcrgwz6vxcdv0pv";
        isLibrary = true;
@@ -97673,8 +97637,8 @@ self: {
        pname = "hasbolt";
        version = "0.1.3.2";
        sha256 = "14sq3iqbrfkwyswdka2285cdhwx3c6srfhn5qb7yw1nfjx2bdb1i";
-       revision = "2";
-       editedCabalFile = "1i6i3ykglq43aa63s39q31fhmn0r8qjr5v9x98q18xzfbxc30232";
+       revision = "3";
+       editedCabalFile = "10h7pbkrkc9cdxx09zk0s8ygcdva2xy646zq3k8czph3vdaffzqx";
        libraryHaskellDepends = [
          base binary bytestring connection containers data-binary-ieee754
          data-default network text transformers
@@ -97687,20 +97651,25 @@ self: {
      }) {};
 
   "hasbolt-extras" = callPackage
-    ({ mkDerivation, aeson, aeson-casing, base, containers, free
-     , hasbolt, lens, mtl, neat-interpolation, scientific
-     , template-haskell, text, th-lift-instances, unordered-containers
-     , vector
+    ({ mkDerivation, aeson, aeson-casing, base, bytestring, containers
+     , data-default, free, hasbolt, lens, mtl, neat-interpolation
+     , scientific, template-haskell, text, th-lift-instances
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "hasbolt-extras";
-       version = "0.0.0.14";
-       sha256 = "1sqlngr8wbvs94j1qmqam0q5shjbil61j7dq520qa87rblljs96i";
+       version = "0.0.0.15";
+       sha256 = "114yzmvj96nhq37947p5kf3zc4hdh4dnbavms0f1ndszmn1q7hd9";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson aeson-casing base containers free hasbolt lens mtl
          neat-interpolation scientific template-haskell text
          th-lift-instances unordered-containers vector
        ];
+       executableHaskellDepends = [
+         aeson base bytestring containers data-default hasbolt mtl text
+       ];
        description = "Extras for hasbolt library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -98347,18 +98316,18 @@ self: {
      }) {};
 
   "haskdogs" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , hasktags, optparse-applicative, process, text
+    ({ mkDerivation, base, containers, directory, filepath, hasktags
+     , optparse-applicative, process-extras, text
      }:
      mkDerivation {
        pname = "haskdogs";
-       version = "0.5.4";
-       sha256 = "1f35np3a99y3aifqgp24c5wdjr5nvvs3jj6g71v39355sjj1hsqq";
+       version = "0.6.0";
+       sha256 = "0xqnsirgbwnp3kbvdmbg8d1b8lm2yk4fvjx71k8274gi7z62l458";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base bytestring containers directory filepath hasktags
-         optparse-applicative process text
+         base containers directory filepath hasktags optparse-applicative
+         process-extras text
        ];
        description = "Generate tags file for Haskell project and its nearest deps";
        license = stdenv.lib.licenses.bsd3;
@@ -101127,8 +101096,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskoin-store";
-       version = "0.9.2";
-       sha256 = "1p4za0b6n7ldz7jnq25n9f7wmngxy8ic0vy1kppb7wka0a96sdh1";
+       version = "0.9.3";
+       sha256 = "17k51kh9vi2bkf6hfn50wpqsnc0qrclvphqy8wcmsz0n2ik8rb7h";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -102073,6 +102042,7 @@ self: {
        ];
        description = "\"optparse-applicative\" parsers for \"hasql\"";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasql-pool" = callPackage
@@ -102085,6 +102055,7 @@ self: {
        testHaskellDepends = [ base-prelude hasql hspec ];
        description = "A pool of connections for Hasql";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasql-postgres" = callPackage
@@ -102533,10 +102504,8 @@ self: {
      }:
      mkDerivation {
        pname = "haven";
-       version = "0.2.0.0";
-       sha256 = "0cclphiq2jkk1msp5yg2mpkfn98jlqnc0vvwmi3vqcy5ln7641v1";
-       revision = "1";
-       editedCabalFile = "1p4m1iv3649b2wf6wdgbknhpms8rna5sibdi93zxyj0a4b23dh23";
+       version = "0.2.0.1";
+       sha256 = "15q9cgfifz87ns730agv2vzc8rp5lqggiclc91khpckm2qppk6yd";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -106402,6 +106371,7 @@ self: {
        ];
        description = "Hierarchical spectral clustering of a graph";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hierarchy" = callPackage
@@ -107415,29 +107385,20 @@ self: {
      }) {};
 
   "hit" = callPackage
-    ({ mkDerivation, attoparsec, base, byteable, bytedump, bytestring
-     , containers, cryptohash, hourglass, mtl, parsec, patience, random
-     , system-fileio, system-filepath, tasty, tasty-quickcheck
-     , unix-compat, utf8-string, vector, zlib, zlib-bindings
+    ({ mkDerivation, base, bytestring, containers, git, hashable
+     , hashtables, hourglass
      }:
      mkDerivation {
        pname = "hit";
-       version = "0.6.3";
-       sha256 = "0wg44vgd5jzi0r0vg8k5zrvlr7rcrb4nrp862c6y991941qv71nv";
-       revision = "2";
-       editedCabalFile = "1wcc2lywirc6dmhssnbhgv38vf3xz371y99id30bhg1brmiwmii3";
-       isLibrary = true;
+       version = "0.7.0";
+       sha256 = "1d3kqc9yd5hxcrr406cwbxjqnqj0bh4laayx2v1mqqz48x6rmqah";
+       isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         attoparsec base byteable bytestring containers cryptohash hourglass
-         mtl parsec patience random system-fileio system-filepath
-         unix-compat utf8-string vector zlib zlib-bindings
-       ];
-       testHaskellDepends = [
-         base bytedump bytestring hourglass tasty tasty-quickcheck
+       executableHaskellDepends = [
+         base bytestring containers git hashable hashtables hourglass
        ];
-       description = "Git operations in haskell";
+       description = "Git like program in haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -108094,8 +108055,8 @@ self: {
      }:
      mkDerivation {
        pname = "hlint";
-       version = "2.1.13";
-       sha256 = "1ac553qf1pc093hrc3kf8yik68619683pazmlm8r2jqqq502fgxc";
+       version = "2.1.14";
+       sha256 = "0arz6x0r4pji37papdrc6brybcd2a2sackvhzmhy89ycgy0k04kk";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -108770,6 +108731,7 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Hidden Markov Models using LAPACK primitives";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmp3" = callPackage
@@ -109892,8 +109854,8 @@ self: {
      }:
      mkDerivation {
        pname = "hoogle";
-       version = "5.0.17.4";
-       sha256 = "059dys3vlbxpd4kx1nrjib1ww9rqkk9am3gdsy3d8vl0fxx2p6s9";
+       version = "5.0.17.5";
+       sha256 = "1vpx6v8b0jixn82iqz085w2qpyj5pl2qyhrcd0a4p0vs5qmplf60";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -111321,6 +111283,7 @@ self: {
        ];
        description = "Python language tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hquantlib" = callPackage
@@ -113607,8 +113570,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsimport";
-       version = "0.8.6";
-       sha256 = "0ylbg5bcylc0gql0qvmih66dj1qj8imn31b6bl70mynwkqh96g1d";
+       version = "0.8.8";
+       sha256 = "0q6348iz4w8zfdrzv98vydw5rdxlhqapdqhxrnhd6dqlcjq3rf1j";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -114202,30 +114165,6 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hspec_2_4_8" = callPackage
-    ({ mkDerivation, base, call-stack, directory, hspec-core
-     , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck
-     , stringbuilder, transformers
-     }:
-     mkDerivation {
-       pname = "hspec";
-       version = "2.4.8";
-       sha256 = "18pddkfz661b1nr1nziq8cnmlzxiqzzmrcrk3iwn476vi3bf1m4l";
-       libraryHaskellDepends = [
-         base call-stack hspec-core hspec-discover hspec-expectations HUnit
-         QuickCheck transformers
-       ];
-       testHaskellDepends = [
-         base call-stack directory hspec-core hspec-discover
-         hspec-expectations hspec-meta HUnit QuickCheck stringbuilder
-         transformers
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "A Testing Framework for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "hspec" = callPackage
     ({ mkDerivation, base, hspec-core, hspec-discover
      , hspec-expectations, QuickCheck
@@ -114301,35 +114240,6 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec-core_2_4_8" = callPackage
-    ({ mkDerivation, ansi-terminal, array, base, call-stack, deepseq
-     , directory, filepath, hspec-expectations, hspec-meta, HUnit
-     , process, QuickCheck, quickcheck-io, random, setenv, silently, stm
-     , temporary, tf-random, time, transformers
-     }:
-     mkDerivation {
-       pname = "hspec-core";
-       version = "2.4.8";
-       sha256 = "02zr6n7mqdncvf1braf38zjdplaxrkg11x9k8717k4yg57585ji4";
-       revision = "1";
-       editedCabalFile = "05rfar3kl9nkh421jxx71p6dn3zykj61lj1hjhrj0z3s6m1ihn5q";
-       libraryHaskellDepends = [
-         ansi-terminal array base call-stack deepseq directory filepath
-         hspec-expectations HUnit QuickCheck quickcheck-io random setenv stm
-         tf-random time transformers
-       ];
-       testHaskellDepends = [
-         ansi-terminal array base call-stack deepseq directory filepath
-         hspec-expectations hspec-meta HUnit process QuickCheck
-         quickcheck-io random setenv silently stm temporary tf-random time
-         transformers
-       ];
-       testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'";
-       description = "A Testing Framework for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "hspec-core" = callPackage
     ({ mkDerivation, ansi-terminal, array, base, call-stack, clock
      , deepseq, directory, filepath, hspec-expectations, hspec-meta
@@ -114403,25 +114313,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hspec-discover_2_4_8" = callPackage
-    ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
-     }:
-     mkDerivation {
-       pname = "hspec-discover";
-       version = "2.4.8";
-       sha256 = "0llwdfpjgfpi7dr8caw0fldb9maqznmqh4awkvx72bz538gqmlka";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base directory filepath ];
-       executableHaskellDepends = [ base directory filepath ];
-       testHaskellDepends = [
-         base directory filepath hspec-meta QuickCheck
-       ];
-       description = "Automatically discover and run Hspec tests";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "hspec-discover" = callPackage
     ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
      }:
@@ -115809,22 +115700,6 @@ self: {
      }) {};
 
   "hsyslog" = callPackage
-    ({ mkDerivation, base, Cabal, cabal-doctest, doctest }:
-     mkDerivation {
-       pname = "hsyslog";
-       version = "5.0.1";
-       sha256 = "05k0ckgqzjpa3mqamlswi0kpvqxvq40awip0cvhpzjx64240vpl6";
-       isLibrary = true;
-       isExecutable = true;
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base doctest ];
-       description = "FFI interface to syslog(3) from POSIX.1-2001";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
-     }) {};
-
-  "hsyslog_5_0_2" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "hsyslog";
@@ -115835,7 +115710,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "FFI interface to syslog(3) from POSIX.1-2001";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
@@ -116688,6 +116562,8 @@ self: {
        pname = "http-client-openssl";
        version = "0.3.0.0";
        sha256 = "0y7d1bp045mj1lnbd74a1v4viv5g5awivdhbycq75hnvqf2n50vl";
+       revision = "2";
+       editedCabalFile = "0p8vgakciq8ar9pfahh1bmriann3h0xn4z3xb328lgbcxxxpwqfd";
        libraryHaskellDepends = [
          base bytestring HsOpenSSL http-client network
        ];
@@ -116866,6 +116742,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "http-conduit_2_3_5" = callPackage
+    ({ mkDerivation, aeson, base, blaze-builder, bytestring
+     , case-insensitive, conduit, conduit-extra, connection, cookie
+     , data-default-class, hspec, http-client, http-client-tls
+     , http-types, HUnit, mtl, network, resourcet, streaming-commons
+     , temporary, text, time, transformers, unliftio, unliftio-core
+     , utf8-string, wai, wai-conduit, warp, warp-tls
+     }:
+     mkDerivation {
+       pname = "http-conduit";
+       version = "2.3.5";
+       sha256 = "0hbdsp5x7mwxcjkshkf0hqfgkjcsy1g34m4im5v078izhv3fzad9";
+       revision = "1";
+       editedCabalFile = "03yfl2n04blmmqca18b18jwplmcz7qjzqjgzrrzbd1nr290ivqjz";
+       libraryHaskellDepends = [
+         aeson base bytestring conduit conduit-extra http-client
+         http-client-tls http-types mtl resourcet transformers unliftio-core
+       ];
+       testHaskellDepends = [
+         aeson base blaze-builder bytestring case-insensitive conduit
+         conduit-extra connection cookie data-default-class hspec
+         http-client http-types HUnit network resourcet streaming-commons
+         temporary text time transformers unliftio utf8-string wai
+         wai-conduit warp warp-tls
+       ];
+       doCheck = false;
+       description = "HTTP client package with conduit interface and HTTPS support";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "http-conduit-browser" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring
      , case-insensitive, conduit, containers, cookie, data-default
@@ -117009,6 +116916,8 @@ self: {
        pname = "http-io-streams";
        version = "0.1.0.0";
        sha256 = "0fxz7p5n7gd99xjq9rwm6x74qzpfp4wdmhj1hm08c7hkinizdvgv";
+       revision = "1";
+       editedCabalFile = "10fcy17ny5qvabm98md9j8r7vfklgzxvg89iinna7wm4v6q6j5w5";
        libraryHaskellDepends = [
          attoparsec base base64-bytestring blaze-builder bytestring
          case-insensitive containers directory HsOpenSSL io-streams mtl
@@ -117843,19 +117752,6 @@ self: {
     ({ mkDerivation, base, criterion, doctest, Glob }:
      mkDerivation {
        pname = "human-readable-duration";
-       version = "0.2.1.2";
-       sha256 = "142ng2395pa9lcllb0sh8n974d58r4ny05nlsj6y3gd04prdwlk5";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base doctest Glob ];
-       benchmarkHaskellDepends = [ base criterion ];
-       description = "Provide duration helper";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "human-readable-duration_0_2_1_3" = callPackage
-    ({ mkDerivation, base, criterion, doctest, Glob }:
-     mkDerivation {
-       pname = "human-readable-duration";
        version = "0.2.1.3";
        sha256 = "1zq85v9knc73ck9lqrn4k0w121ifpjg7j053qmhgam0605j89236";
        libraryHaskellDepends = [ base ];
@@ -117863,7 +117759,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Provide duration helper";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "human-text" = callPackage
@@ -117929,23 +117824,11 @@ self: {
     ({ mkDerivation, base, dejafu, exceptions, HUnit }:
      mkDerivation {
        pname = "hunit-dejafu";
-       version = "1.2.0.6";
-       sha256 = "10zndwkgpliyycyynfd34nhzplfhs9cychpznzzcwbpckx3w5ajl";
-       libraryHaskellDepends = [ base dejafu exceptions HUnit ];
-       description = "Deja Fu support for the HUnit test framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hunit-dejafu_1_2_1_0" = callPackage
-    ({ mkDerivation, base, dejafu, exceptions, HUnit }:
-     mkDerivation {
-       pname = "hunit-dejafu";
        version = "1.2.1.0";
        sha256 = "075xx6rz1bxyj00plkrfz04wfq1rim8nkn43xj0d7js86qhvqyrc";
        libraryHaskellDepends = [ base dejafu exceptions HUnit ];
        description = "Deja Fu support for the HUnit test framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hunit-gui" = callPackage
@@ -118678,6 +118561,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hw-json-simd" = callPackage
+    ({ mkDerivation, base, bytestring, c2hs, hw-prim, lens
+     , optparse-applicative, vector
+     }:
+     mkDerivation {
+       pname = "hw-json-simd";
+       version = "0.1.0.0";
+       sha256 = "015frhg0v7vxrl1m4bjg2rfa7z0846g9xclirdhb4n5pjzr11rp9";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base bytestring hw-prim lens vector ];
+       libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [
+         base bytestring hw-prim lens optparse-applicative vector
+       ];
+       testHaskellDepends = [ base bytestring hw-prim lens vector ];
+       description = "SIMD-based JSON semi-indexer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hw-kafka-avro" = callPackage
     ({ mkDerivation, aeson, avro, base, binary, bytestring, cache
      , containers, errors, hashable, hspec, http-client, http-types
@@ -122575,30 +122479,6 @@ self: {
      }:
      mkDerivation {
        pname = "influxdb";
-       version = "1.6.1.1";
-       sha256 = "0cmhy4v00jvz1n4xfa0pcxgld7mc6idj4jl2b3n01jfhjff22ryi";
-       isLibrary = true;
-       isExecutable = true;
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring clock containers foldl http-client
-         http-types lens network optional-args scientific tagged text time
-         unordered-containers vector
-       ];
-       testHaskellDepends = [ base doctest QuickCheck template-haskell ];
-       description = "Haskell client library for InfluxDB";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "influxdb_1_6_1_2" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
-     , cabal-doctest, clock, containers, doctest, foldl, http-client
-     , http-types, lens, network, optional-args, QuickCheck, scientific
-     , tagged, template-haskell, text, time, unordered-containers
-     , vector
-     }:
-     mkDerivation {
-       pname = "influxdb";
        version = "1.6.1.2";
        sha256 = "1bzy78amw6k02bi2fjm2i8vah9lwxpy2fdlq35gdsffhwrif29mg";
        isLibrary = true;
@@ -122612,7 +122492,6 @@ self: {
        testHaskellDepends = [ base doctest QuickCheck template-haskell ];
        description = "Haskell client library for InfluxDB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "informative" = callPackage
@@ -124091,6 +123970,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "io-streams_1_5_1_0" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder
+     , deepseq, directory, filepath, HUnit, mtl, network, primitive
+     , process, QuickCheck, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, time, transformers, vector
+     , zlib, zlib-bindings
+     }:
+     mkDerivation {
+       pname = "io-streams";
+       version = "1.5.1.0";
+       sha256 = "1c7byr943x41nxpc3bnz152fvfbmakafq2958wyf9qiyp2pz18la";
+       configureFlags = [ "-fNoInteractiveTests" ];
+       libraryHaskellDepends = [
+         attoparsec base bytestring bytestring-builder network primitive
+         process text time transformers vector zlib-bindings
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring bytestring-builder deepseq directory
+         filepath HUnit mtl network primitive process QuickCheck
+         test-framework test-framework-hunit test-framework-quickcheck2 text
+         time transformers vector zlib zlib-bindings
+       ];
+       description = "Simple, composable, and easy-to-use stream I/O";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "io-streams-haproxy" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, HUnit, io-streams
      , network, test-framework, test-framework-hunit, transformers
@@ -124112,6 +124018,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "io-streams-haproxy_1_0_1_0" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, HUnit, io-streams
+     , network, test-framework, test-framework-hunit, transformers
+     }:
+     mkDerivation {
+       pname = "io-streams-haproxy";
+       version = "1.0.1.0";
+       sha256 = "1dcn5hd4fiwyq7m01r6fi93vfvygca5s6mz87c78m0zyj29clkmp";
+       libraryHaskellDepends = [
+         attoparsec base bytestring io-streams network transformers
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring HUnit io-streams network test-framework
+         test-framework-hunit transformers
+       ];
+       description = "HAProxy protocol 1.5 support for io-streams";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "io-streams-http" = callPackage
     ({ mkDerivation, base, bytestring, http-client, http-client-tls
      , io-streams, mtl, transformers
@@ -125022,6 +124948,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "isobmff" = callPackage
+    ({ mkDerivation, base, binary, bytestring, criterion, data-default
+     , function-builder, hspec, mtl, pretty-types, QuickCheck
+     , singletons, tagged, template-haskell, text, time, type-spec
+     , vector
+     }:
+     mkDerivation {
+       pname = "isobmff";
+       version = "0.13.0.0";
+       sha256 = "032lcpdifrryi4ryz3gwzh9l5927amcpr8xk8jbjwz0mj3z857d5";
+       libraryHaskellDepends = [
+         base bytestring data-default function-builder mtl pretty-types
+         singletons tagged template-haskell text time type-spec vector
+       ];
+       testHaskellDepends = [
+         base binary bytestring hspec mtl pretty-types QuickCheck tagged
+         text type-spec
+       ];
+       benchmarkHaskellDepends = [
+         base binary bytestring criterion tagged type-spec
+       ];
+       description = "A parser and generator for the ISO-14496-12/14 base media file format";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "isobmff-builder" = callPackage
     ({ mkDerivation, base, binary, bytestring, criterion, data-default
      , hspec, mtl, pretty-types, QuickCheck, singletons, tagged
@@ -128892,6 +128843,7 @@ self: {
        ];
        description = "Fast concurrent queues much inspired by unagi-chan";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kbq-gu" = callPackage
@@ -131182,6 +131134,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {mp3lame = null;};
 
+  "lame_0_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, directory, exceptions, filepath
+     , hspec, hspec-discover, htaglib, mp3lame, temporary, text
+     , transformers, wave
+     }:
+     mkDerivation {
+       pname = "lame";
+       version = "0.2.0";
+       sha256 = "1bqq3aanfffdsl3v0am7jdfslcr6y372cq7jx36z7g09zy5mp2sp";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base bytestring directory exceptions filepath text transformers
+         wave
+       ];
+       librarySystemDepends = [ mp3lame ];
+       testHaskellDepends = [
+         base directory filepath hspec htaglib temporary text
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Fairly complete high-level binding to LAME encoder";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {mp3lame = null;};
+
   "lame-tester" = callPackage
     ({ mkDerivation, base-noprelude, bizzlelude, containers, semigroups
      , tasty, tasty-hunit, validation
@@ -131919,26 +131895,29 @@ self: {
   "language-oberon" = callPackage
     ({ mkDerivation, base, containers, directory, either, filepath
      , grammatical-parsers, optparse-applicative, parsers, prettyprinter
-     , rank2classes, repr-tree-syb, tasty, tasty-hunit, text
+     , rank2classes, repr-tree-syb, tasty, tasty-hunit, template-haskell
+     , text, transformers
      }:
      mkDerivation {
        pname = "language-oberon";
-       version = "0.2";
-       sha256 = "052kgd4d1cwdqs8znkx2fagjlb39x6c2lhvic6il2c67ali53nhr";
+       version = "0.2.1";
+       sha256 = "1ia0m9bgrz1jksw349a0pgmkfvy5ykc29n55w7w457c60y37bs02";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base containers directory either filepath grammatical-parsers
-         parsers prettyprinter rank2classes text
+         parsers prettyprinter rank2classes template-haskell text
+         transformers
        ];
        executableHaskellDepends = [
          base containers either filepath grammatical-parsers
          optparse-applicative prettyprinter rank2classes repr-tree-syb text
        ];
        testHaskellDepends = [
-         base directory either filepath tasty tasty-hunit
+         base directory either filepath grammatical-parsers prettyprinter
+         tasty tasty-hunit text
        ];
-       description = "Parser and pretty-printer for the Oberon programming language";
+       description = "Parser, pretty-printer, and type checker for the Oberon programming language";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -132386,28 +132365,6 @@ self: {
      }:
      mkDerivation {
        pname = "lapack-ffi-tools";
-       version = "0.1.1";
-       sha256 = "1y3h69mkbjidl146y1w0symk8rgpir5gb5914ymmg83nsyyl16vk";
-       isLibrary = false;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       executableHaskellDepends = [
-         base bytestring cassava containers explicit-exception filepath
-         non-empty optparse-applicative parsec pathtype transformers
-         unordered-containers utility-ht vector
-       ];
-       description = "Generator for Haskell interface to Fortran LAPACK";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "lapack-ffi-tools_0_1_2" = callPackage
-    ({ mkDerivation, base, bytestring, cassava, containers
-     , explicit-exception, filepath, non-empty, optparse-applicative
-     , parsec, pathtype, transformers, unordered-containers, utility-ht
-     , vector
-     }:
-     mkDerivation {
-       pname = "lapack-ffi-tools";
        version = "0.1.2";
        sha256 = "14wfnddya7ch8hm3wgabd7nma7ahcgv6h2innfbp1ck92isn2s0q";
        isLibrary = false;
@@ -132420,7 +132377,6 @@ self: {
        ];
        description = "Generator for Haskell interface to Fortran LAPACK";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "large-hashable" = callPackage
@@ -133192,24 +133148,6 @@ self: {
      }:
      mkDerivation {
        pname = "leancheck-instances";
-       version = "0.0.2";
-       sha256 = "1p8ip47v4jc5rkqj456dmsh2scl19lvh9zimkr844lvyhbxifgbb";
-       libraryHaskellDepends = [
-         array base bytestring containers leancheck nats text time
-       ];
-       testHaskellDepends = [
-         base bytestring containers leancheck nats text
-       ];
-       description = "Common LeanCheck instances";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "leancheck-instances_0_0_3" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, leancheck
-     , nats, text, time
-     }:
-     mkDerivation {
-       pname = "leancheck-instances";
        version = "0.0.3";
        sha256 = "1h6aw2fvdcjaz9r90l3c9znykn0y9gvg74ycvkrqw823sd9ywwd6";
        libraryHaskellDepends = [
@@ -133220,7 +133158,6 @@ self: {
        ];
        description = "Common LeanCheck instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "leankit-api" = callPackage
@@ -133590,6 +133527,7 @@ self: {
        libraryHaskellDepends = [ accelerate base lens ];
        description = "Instances to mix lens with accelerate";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lens-action" = callPackage
@@ -134767,6 +134705,53 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "libraft_0_2_0_0" = callPackage
+    ({ mkDerivation, atomic-write, attoparsec, base, base16-bytestring
+     , bytestring, cereal, concurrency, containers, cryptohash-sha256
+     , dejafu, directory, exceptions, file-embed, haskeline
+     , hunit-dejafu, lifted-base, monad-control, mtl, network
+     , network-simple, parsec, postgresql-simple, process, protolude
+     , QuickCheck, quickcheck-state-machine, random, repline, stm, tasty
+     , tasty-dejafu, tasty-discover, tasty-expected-failure, tasty-hunit
+     , tasty-quickcheck, text, time, transformers, transformers-base
+     , tree-diff, word8
+     }:
+     mkDerivation {
+       pname = "libraft";
+       version = "0.2.0.0";
+       sha256 = "0lm2b9n1xlpzsxcvnhc3bkcgzbrwxb1l0ffjjqa55hn42dw8ng1d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         atomic-write attoparsec base base16-bytestring bytestring cereal
+         concurrency containers cryptohash-sha256 directory exceptions
+         file-embed haskeline lifted-base monad-control mtl network
+         network-simple parsec postgresql-simple protolude random repline
+         text time transformers transformers-base word8
+       ];
+       executableHaskellDepends = [
+         atomic-write attoparsec base base16-bytestring bytestring cereal
+         concurrency containers cryptohash-sha256 directory exceptions
+         file-embed haskeline lifted-base monad-control mtl network
+         network-simple parsec postgresql-simple protolude random repline
+         stm text time transformers transformers-base word8
+       ];
+       testHaskellDepends = [
+         atomic-write attoparsec base base16-bytestring bytestring cereal
+         concurrency containers cryptohash-sha256 dejafu directory
+         exceptions file-embed haskeline hunit-dejafu lifted-base
+         monad-control mtl network network-simple parsec postgresql-simple
+         process protolude QuickCheck quickcheck-state-machine random
+         repline tasty tasty-dejafu tasty-discover tasty-expected-failure
+         tasty-hunit tasty-quickcheck text time transformers
+         transformers-base tree-diff word8
+       ];
+       testToolDepends = [ tasty-discover ];
+       description = "Raft consensus algorithm";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "librandomorg" = callPackage
     ({ mkDerivation, base, bytestring, curl }:
      mkDerivation {
@@ -135623,6 +135608,7 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Lifting linear vector spaces into Accelerate";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linear-algebra-cblas" = callPackage
@@ -136510,24 +136496,6 @@ self: {
      }:
      mkDerivation {
        pname = "list-t";
-       version = "1.0.3";
-       sha256 = "1kkiyfz7ra3i7jah1z347aq534isz7w8ancbhv6if905ybd3bhvf";
-       revision = "1";
-       editedCabalFile = "0f476hjzg99c51ac7ncl2w7lv8dakqwscqd7lx9n5cv3sclr38y5";
-       libraryHaskellDepends = [
-         base mmorph monad-control mtl transformers transformers-base
-       ];
-       testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ];
-       description = "ListT done right";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "list-t_1_0_3_1" = callPackage
-    ({ mkDerivation, base, base-prelude, HTF, mmorph, monad-control
-     , mtl, mtl-prelude, transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "list-t";
        version = "1.0.3.1";
        sha256 = "0h6bwljy0cqm1fsq151glglnvczjcvbphxiw7c83ps2zy9whg4y9";
        libraryHaskellDepends = [
@@ -136536,7 +136504,6 @@ self: {
        testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ];
        description = "ListT done right";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "list-t-attoparsec" = callPackage
@@ -139908,6 +139875,7 @@ self: {
        ];
        description = "Control screen and keyboard backlights on MACs under Linux";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "macos-corelibs" = callPackage
@@ -140071,8 +140039,8 @@ self: {
     ({ mkDerivation, base, hmatrix, transformers, utility-ht }:
      mkDerivation {
        pname = "magico";
-       version = "0.0.1.1";
-       sha256 = "0cr6dk02k80ljfajg715rk5afzlll12zlg50dpxlb39624nli7hl";
+       version = "0.0.1.2";
+       sha256 = "17vr7bn7w7wyh7v3gw4lv7nj0qzv2b8cn9f9drjlb08ahxqgqg08";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -141478,27 +141446,6 @@ self: {
      }:
      mkDerivation {
        pname = "massiv";
-       version = "0.2.6.0";
-       sha256 = "07mns6fqkvyq9v80jqpqawb37a58irz85hplgq38aqz4gihv642f";
-       libraryHaskellDepends = [
-         base bytestring data-default-class deepseq ghc-prim primitive
-         vector
-       ];
-       testHaskellDepends = [
-         base bytestring data-default deepseq hspec QuickCheck
-         safe-exceptions vector
-       ];
-       description = "Massiv (Массив) is an Array Library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "massiv_0_2_7_0" = callPackage
-    ({ mkDerivation, base, bytestring, data-default, data-default-class
-     , deepseq, ghc-prim, hspec, primitive, QuickCheck, safe-exceptions
-     , vector
-     }:
-     mkDerivation {
-       pname = "massiv";
        version = "0.2.7.0";
        sha256 = "080pdghb6yf08addkysdpgdgzf60lc90z580vk2igjfc23w9xwc7";
        libraryHaskellDepends = [
@@ -141511,7 +141458,6 @@ self: {
        ];
        description = "Massiv (Массив) is an Array Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "massiv-io" = callPackage
@@ -145664,6 +145610,7 @@ self: {
        ];
        description = "Find the modularity of a network";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "module-management" = callPackage
@@ -146044,6 +145991,7 @@ self: {
        testHaskellDepends = [ base hlint tasty tasty-hspec ];
        description = "A monad transformer for weighted graph searches";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-exception" = callPackage
@@ -147841,6 +147789,7 @@ self: {
        libraryHaskellDepends = [ morphisms ];
        description = "Functors, theirs compositions and transformations";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "morphisms-functors-inventory" = callPackage
@@ -147852,6 +147801,7 @@ self: {
        libraryHaskellDepends = [ morphisms morphisms-functors ];
        description = "Inventory is state and store";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "morphisms-objects" = callPackage
@@ -147863,6 +147813,7 @@ self: {
        libraryHaskellDepends = [ morphisms ];
        description = "Algebraic structures";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "morte" = callPackage
@@ -150080,6 +150031,7 @@ self: {
        libraryHaskellDepends = [ accelerate base mwc-random ];
        description = "Generate Accelerate arrays filled with high quality pseudorandom numbers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mwc-random-monad" = callPackage
@@ -150405,29 +150357,6 @@ self: {
      }:
      mkDerivation {
        pname = "mysql-haskell";
-       version = "0.8.4.1";
-       sha256 = "0m3kqm5ldy47gv0gbh3sxv2zm4kmszw96r5sar5bzb3v9jvmz94x";
-       libraryHaskellDepends = [
-         base binary binary-ieee754 binary-parsers blaze-textual bytestring
-         bytestring-lexing cryptonite io-streams memory monad-loops network
-         scientific tcp-streams text time tls vector wire-streams word24
-       ];
-       testHaskellDepends = [
-         base bytestring io-streams tasty tasty-hunit text time vector
-       ];
-       description = "pure haskell MySQL driver";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "mysql-haskell_0_8_4_2" = callPackage
-    ({ mkDerivation, base, binary, binary-ieee754, binary-parsers
-     , blaze-textual, bytestring, bytestring-lexing, cryptonite
-     , io-streams, memory, monad-loops, network, scientific, tasty
-     , tasty-hunit, tcp-streams, text, time, tls, vector, wire-streams
-     , word24
-     }:
-     mkDerivation {
-       pname = "mysql-haskell";
        version = "0.8.4.2";
        sha256 = "1lg9w9kwjnrx948r24flw0yjwxc8f93ygg45dl2djk4kfxdfnlaz";
        libraryHaskellDepends = [
@@ -150440,7 +150369,6 @@ self: {
        ];
        description = "pure haskell MySQL driver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mysql-haskell-nem" = callPackage
@@ -151838,26 +151766,27 @@ self: {
   "net-mqtt" = callPackage
     ({ mkDerivation, async, attoparsec, base, binary, bytestring
      , conduit, conduit-extra, containers, HUnit, network-conduit-tls
-     , QuickCheck, stm, tasty, tasty-hunit, tasty-quickcheck, text
+     , network-uri, QuickCheck, stm, tasty, tasty-hunit
+     , tasty-quickcheck, text
      }:
      mkDerivation {
        pname = "net-mqtt";
-       version = "0.2.1.0";
-       sha256 = "177w50gcjj7n44y9q4q5xb3gh42ivx7ld7ha3mqg8ik803q523y9";
+       version = "0.2.2.0";
+       sha256 = "1pmjlj90jzyg7ypzaiyw4cl8qv6h5l7923b3zhfwsvi07c2lwi1h";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          async attoparsec base binary bytestring conduit conduit-extra
-         containers network-conduit-tls stm text
+         containers network-conduit-tls network-uri stm text
        ];
        executableHaskellDepends = [
          async attoparsec base binary bytestring conduit conduit-extra
-         containers network-conduit-tls stm text
+         containers network-conduit-tls network-uri stm text
        ];
        testHaskellDepends = [
          async attoparsec base binary bytestring conduit conduit-extra
-         containers HUnit network-conduit-tls QuickCheck stm tasty
-         tasty-hunit tasty-quickcheck text
+         containers HUnit network-conduit-tls network-uri QuickCheck stm
+         tasty tasty-hunit tasty-quickcheck text
        ];
        description = "An MQTT Protocol Implementation";
        license = stdenv.lib.licenses.bsd3;
@@ -152520,6 +152449,7 @@ self: {
        libraryHaskellDepends = [ base deepseq network ];
        description = "POSIX network database (<netdb.h>) API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-builder" = callPackage
@@ -153671,8 +153601,8 @@ self: {
      }:
      mkDerivation {
        pname = "ngx-export";
-       version = "1.6.3";
-       sha256 = "0dqfjiw55cd16grrqdp1ml557rh58dy3lfcjrfmy91kb5v50cqz6";
+       version = "1.6.4";
+       sha256 = "13q2699mamkqfkklk6wgm9jzsb650lrbiqsf8sg66yvhgrxmmk0i";
        libraryHaskellDepends = [
          async base binary bytestring deepseq monad-loops template-haskell
          unix
@@ -153687,8 +153617,8 @@ self: {
      }:
      mkDerivation {
        pname = "ngx-export-tools";
-       version = "0.4.3.0";
-       sha256 = "13vhbwld700f56gd95jm9rrzbzx6sp5mimf8qrjdxqwjj2a3rbmp";
+       version = "0.4.4.0";
+       sha256 = "19x6qzryjdac1alq4wsmy0as6258ga9b3ga3iszqwvqjdpc89a6n";
        libraryHaskellDepends = [
          aeson base binary bytestring ngx-export safe template-haskell
        ];
@@ -154458,22 +154388,6 @@ self: {
      }:
      mkDerivation {
        pname = "non-empty";
-       version = "0.3.0.1";
-       sha256 = "00zbnpcnmchbbdgyw19m1bl3bdhmw89pp9k0mq3z75nz0i40gg9z";
-       revision = "1";
-       editedCabalFile = "1628z42q77xjvwpyx3rifqf6mh4y6ivdl0lkhngxwz8c21bnf7d3";
-       libraryHaskellDepends = [
-         base containers deepseq QuickCheck utility-ht
-       ];
-       description = "List-like structures with static restrictions on the number of elements";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "non-empty_0_3_1" = callPackage
-    ({ mkDerivation, base, containers, deepseq, QuickCheck, utility-ht
-     }:
-     mkDerivation {
-       pname = "non-empty";
        version = "0.3.1";
        sha256 = "0118vf88pzx1spzx4amc9sxz5vdrmfpryp816fh9l7k5hnzhy0bh";
        libraryHaskellDepends = [
@@ -154481,7 +154395,6 @@ self: {
        ];
        description = "List-like structures with static restrictions on the number of elements";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "non-empty-containers" = callPackage
@@ -155137,6 +155050,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "num-non-negative" = callPackage
+    ({ mkDerivation, base, inj }:
+     mkDerivation {
+       pname = "num-non-negative";
+       version = "0.1";
+       sha256 = "0ikhjcjwziv55gnf79fhajhgp5m3441snxg8amc241h5iw4rls8x";
+       libraryHaskellDepends = [ base inj ];
+       description = "Non-negative numbers";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "number" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -157538,6 +157462,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "openssl-streams_1_2_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, HsOpenSSL, HUnit, io-streams
+     , network, test-framework, test-framework-hunit
+     }:
+     mkDerivation {
+       pname = "openssl-streams";
+       version = "1.2.2.0";
+       sha256 = "0rplym6ayydkpr7x9mw3l13p0vzzfzzxw244d7sd3jcvaxpv0rmr";
+       libraryHaskellDepends = [
+         base bytestring HsOpenSSL io-streams network
+       ];
+       testHaskellDepends = [
+         base bytestring HsOpenSSL HUnit io-streams network test-framework
+         test-framework-hunit
+       ];
+       description = "OpenSSL network support for io-streams";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "opentheory" = callPackage
     ({ mkDerivation, base, opentheory-primitive, QuickCheck }:
      mkDerivation {
@@ -159766,6 +159710,16 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pandora" = callPackage
+    ({ mkDerivation }:
+     mkDerivation {
+       pname = "pandora";
+       version = "0.1.0";
+       sha256 = "1hfm9a8rfjksjv8qmz8a17f9pg1qw2rizaakl108lafckbz7f4ya";
+       description = "A box of patterns and paradigms";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "pang-a-lambda" = callPackage
     ({ mkDerivation, base, bytestring, containers, IfElse, mtl, SDL
      , SDL-gfx, SDL-ttf, transformers, Yampa
@@ -163297,6 +163251,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "persistent-mysql-haskell_0_5_2" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, conduit, containers
+     , io-streams, monad-logger, mysql-haskell, network, persistent
+     , persistent-template, resource-pool, resourcet, text, time, tls
+     , transformers, unliftio-core
+     }:
+     mkDerivation {
+       pname = "persistent-mysql-haskell";
+       version = "0.5.2";
+       sha256 = "1kc2q9cbgij5b5kz70jcy694v2frgzzb7mvld8dypsz11dlpmhjn";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring conduit containers io-streams monad-logger
+         mysql-haskell network persistent resource-pool resourcet text time
+         tls transformers unliftio-core
+       ];
+       executableHaskellDepends = [
+         base monad-logger persistent persistent-template transformers
+       ];
+       description = "A pure haskell backend for the persistent library using MySQL database server";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "persistent-odbc" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, containers
      , convertible, HDBC, HDBC-odbc, monad-control, monad-logger
@@ -163460,6 +163439,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "persistent-spatial" = callPackage
+    ({ mkDerivation, aeson, base, hspec, http-api-data
+     , integer-logarithms, lens, persistent, QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "persistent-spatial";
+       version = "0.1.0.0";
+       sha256 = "0x9ialzl7mmq3h4nx79z51czddn7xgs0sngixc38cdlmddvm2g36";
+       libraryHaskellDepends = [
+         aeson base http-api-data integer-logarithms lens persistent text
+       ];
+       testHaskellDepends = [
+         aeson base hspec http-api-data persistent QuickCheck text
+       ];
+       description = "Database agnostic, spatially indexed type for geographic points";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "persistent-sqlite_2_6_4" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, containers
      , hspec, microlens-th, monad-control, monad-logger, old-locale
@@ -163544,6 +163541,30 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
+  "persistent-template_2_6_0" = callPackage
+    ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers
+     , ghc-prim, hspec, http-api-data, monad-control, monad-logger
+     , path-pieces, persistent, QuickCheck, tagged, template-haskell
+     , text, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "persistent-template";
+       version = "2.6.0";
+       sha256 = "0wr1z2nfrl6jv1lprxb0d2jw4izqfcbcwvkdrhryzg95gjz8ryjv";
+       libraryHaskellDepends = [
+         aeson aeson-compat base bytestring containers ghc-prim
+         http-api-data monad-control monad-logger path-pieces persistent
+         tagged template-haskell text transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring hspec persistent QuickCheck text transformers
+       ];
+       description = "Type-safe, non-relational, multi-backend persistence";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
+     }) {};
+
   "persistent-template-classy" = callPackage
     ({ mkDerivation, base, lens, persistent, persistent-sqlite
      , persistent-template, template-haskell, text
@@ -168212,6 +168233,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) postgresql;};
 
+  "postgresql-lo-stream" = callPackage
+    ({ mkDerivation, base, bytestring, io-streams, lifted-base
+     , monad-loops, mtl, postgresql-simple
+     }:
+     mkDerivation {
+       pname = "postgresql-lo-stream";
+       version = "0.1.1.0";
+       sha256 = "196f6lz8i8y0cfnd4lqjky69wpi0mc2jfs7jz5v0j3r15jbs5212";
+       libraryHaskellDepends = [
+         base bytestring io-streams lifted-base monad-loops mtl
+         postgresql-simple
+       ];
+       description = "Utilities for streaming PostgreSQL LargeObjects";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "postgresql-named" = callPackage
     ({ mkDerivation, base, bytestring, extra, generics-sop, hspec, mtl
      , postgresql-libpq, postgresql-simple, utf8-string
@@ -168777,6 +168815,7 @@ self: {
        ];
        description = "Integration of \"potoki\" and \"conduit\"";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "potoki-core" = callPackage
@@ -174353,6 +174392,7 @@ self: {
        ];
        description = "QuickCheck common typeclasses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickcheck-combinators" = callPackage
@@ -176074,6 +176114,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "rank2classes_1_2_1" = callPackage
+    ({ mkDerivation, base, distributive, doctest, tasty, tasty-hunit
+     , template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "rank2classes";
+       version = "1.2.1";
+       sha256 = "0dbg5hc8vy0nikyw9h99d9z5jpwfzqb3jwg1li5h281fi5cm4nb0";
+       libraryHaskellDepends = [
+         base distributive template-haskell transformers
+       ];
+       testHaskellDepends = [
+         base distributive doctest tasty tasty-hunit
+       ];
+       description = "standard type constructor class hierarchy, only with methods of rank 2 types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rapid" = callPackage
     ({ mkDerivation, async, base, containers, foreign-store, stm }:
      mkDerivation {
@@ -176741,6 +176800,7 @@ self: {
        ];
        description = "Read-Copy-Update for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rdf" = callPackage
@@ -177576,6 +177636,7 @@ self: {
        ];
        description = "Generic encoding of records";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "record-gl" = callPackage
@@ -177723,6 +177784,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "recursion-schemes_5_1_1" = callPackage
+    ({ mkDerivation, base, base-orphans, comonad, free, HUnit
+     , template-haskell, th-abstraction, transformers
+     }:
+     mkDerivation {
+       pname = "recursion-schemes";
+       version = "5.1.1";
+       sha256 = "0qw112jkl6jzy3wcyxvv5liv16mxiiqi5v5zyzazl9p8h2wy1rb0";
+       libraryHaskellDepends = [
+         base base-orphans comonad free template-haskell th-abstraction
+         transformers
+       ];
+       testHaskellDepends = [ base HUnit template-haskell transformers ];
+       description = "Representing common recursion patterns as higher-order functions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "recursion-schemes-ext" = callPackage
     ({ mkDerivation, base, composition-prelude, criterion, deepseq
      , hspec, lens, recursion-schemes
@@ -178254,27 +178333,37 @@ self: {
      }) {};
 
   "reflex" = callPackage
-    ({ mkDerivation, base, containers, criterion, deepseq
-     , dependent-map, dependent-sum, exception-transformers
-     , haskell-src-exts, haskell-src-meta, MemoTrie, mtl, primitive
-     , ref-tf, semigroups, split, stm, syb, template-haskell, these
-     , transformers, transformers-compat
+    ({ mkDerivation, base, bifunctors, comonad, containers, criterion
+     , data-default, deepseq, dependent-map, dependent-sum, directory
+     , exception-transformers, filemanip, filepath, haskell-src-exts
+     , haskell-src-meta, hlint, lens, loch-th, MemoTrie, monad-control
+     , monoidal-containers, mtl, prim-uniq, primitive, process, random
+     , ref-tf, reflection, semigroupoids, semigroups, split, stm, syb
+     , template-haskell, these, time, transformers, transformers-compat
+     , unbounded-delays
      }:
      mkDerivation {
        pname = "reflex";
-       version = "0.4.0.1";
-       sha256 = "1v4wwy2qc1gb914w5nqjvf7gibdw9yakmhdg260yjxbv1fkg8gyc";
+       version = "0.5";
+       sha256 = "0c9idjkbnw822ky7dn374vq43kivdy0znf2k2w43q7yw7snjh09r";
+       revision = "1";
+       editedCabalFile = "1l5xsinln6wyj726ilqvvg4y0qk645j5ffiyhmda8qi9rmyk2a2x";
        libraryHaskellDepends = [
-         base containers dependent-map dependent-sum exception-transformers
-         haskell-src-exts haskell-src-meta mtl primitive ref-tf semigroups
-         syb template-haskell these transformers transformers-compat
+         base bifunctors comonad containers data-default dependent-map
+         dependent-sum exception-transformers haskell-src-exts
+         haskell-src-meta lens MemoTrie monad-control monoidal-containers
+         mtl prim-uniq primitive random ref-tf reflection semigroupoids
+         semigroups stm syb template-haskell these time transformers
+         transformers-compat unbounded-delays
        ];
        testHaskellDepends = [
-         base containers dependent-map MemoTrie mtl ref-tf
+         base bifunctors containers deepseq dependent-map dependent-sum
+         directory filemanip filepath hlint lens monoidal-containers mtl
+         ref-tf semigroups split these transformers
        ];
        benchmarkHaskellDepends = [
-         base containers criterion deepseq dependent-map dependent-sum mtl
-         primitive ref-tf split stm transformers
+         base containers criterion deepseq dependent-map dependent-sum
+         loch-th mtl primitive process ref-tf split stm time transformers
        ];
        description = "Higher-order Functional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
@@ -178299,25 +178388,17 @@ self: {
      }) {};
 
   "reflex-dom" = callPackage
-    ({ mkDerivation, aeson, base, bifunctors, bytestring, containers
-     , data-default, dependent-map, dependent-sum
-     , dependent-sum-template, directory, exception-transformers
-     , ghcjs-dom, glib, gtk3, lens, mtl, raw-strings-qq, ref-tf, reflex
-     , safe, semigroups, text, these, time, transformers, unix
-     , webkitgtk3, webkitgtk3-javascriptcore
+    ({ mkDerivation, base, bytestring, jsaddle-webkit2gtk, reflex
+     , reflex-dom-core, text
      }:
      mkDerivation {
        pname = "reflex-dom";
-       version = "0.3";
-       sha256 = "0fldnl2yamn24v0qnfr4hhy4q9nq6kxspiy39yk5kdfvxg8aqax5";
-       revision = "2";
-       editedCabalFile = "0mb0mi9czwaqp7vinc081j85gbdrmrgbx07nfdqs6wmcinqf4sdm";
+       version = "0.4";
+       sha256 = "0l559x7w1r1mz8j3ln6x0l2kkl1l494q8zm5gai0rcpz9r1nqn9z";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bifunctors bytestring containers data-default
-         dependent-map dependent-sum dependent-sum-template directory
-         exception-transformers ghcjs-dom glib gtk3 lens mtl raw-strings-qq
-         ref-tf reflex safe semigroups text these time transformers unix
-         webkitgtk3 webkitgtk3-javascriptcore
+         base bytestring jsaddle-webkit2gtk reflex reflex-dom-core text
        ];
        description = "Functional Reactive Web Apps with Reflex";
        license = stdenv.lib.licenses.bsd3;
@@ -178360,6 +178441,36 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "reflex-dom-core" = callPackage
+    ({ mkDerivation, aeson, base, bifunctors, bimap, blaze-builder
+     , bytestring, constraints, containers, contravariant, data-default
+     , dependent-map, dependent-sum, dependent-sum-template, directory
+     , exception-transformers, ghcjs-dom, hlint, jsaddle, jsaddle-warp
+     , keycode, lens, linux-namespaces, monad-control, mtl, network-uri
+     , primitive, process, ref-tf, reflex, semigroups, stm
+     , template-haskell, temporary, text, these, transformers, unix
+     , zenc
+     }:
+     mkDerivation {
+       pname = "reflex-dom-core";
+       version = "0.4";
+       sha256 = "1p844d99zj3v54cn8ys12hbyan4f0y3nhgi42b03cq10az2pvsdv";
+       libraryHaskellDepends = [
+         aeson base bifunctors bimap blaze-builder bytestring constraints
+         containers contravariant data-default dependent-map dependent-sum
+         dependent-sum-template directory exception-transformers ghcjs-dom
+         jsaddle keycode lens monad-control mtl network-uri primitive ref-tf
+         reflex semigroups stm template-haskell text these transformers unix
+         zenc
+       ];
+       testHaskellDepends = [
+         base hlint jsaddle jsaddle-warp linux-namespaces process reflex
+         temporary unix
+       ];
+       description = "Functional Reactive Web Apps with Reflex";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "reflex-dom-fragment-shader-canvas" = callPackage
     ({ mkDerivation, base, containers, ghcjs-dom, jsaddle, lens
      , reflex-dom, text, transformers
@@ -179308,28 +179419,31 @@ self: {
      }) {};
 
   "registry" = callPackage
-    ({ mkDerivation, async, base, exceptions, hedgehog, hedgehog-corpus
-     , io-memoize, MonadRandom, mtl, protolude, random, resourcet, tasty
+    ({ mkDerivation, async, base, containers, exceptions, hashable
+     , hedgehog, hedgehog-corpus, io-memoize, MonadRandom, mtl
+     , protolude, random, resourcet, semigroupoids, semigroups, tasty
      , tasty-discover, tasty-hedgehog, tasty-th, text, transformers-base
      }:
      mkDerivation {
        pname = "registry";
-       version = "0.1.2.2";
-       sha256 = "1knhdrjj5y9p8974am4z31k163yjz3123lvjjk1ml4ba65afqhc7";
+       version = "0.1.2.3";
+       sha256 = "17jzvbig0zcmhb1vf2g286px35j3kh544rpsap0094lmj9yac7ni";
        libraryHaskellDepends = [
-         base exceptions mtl protolude resourcet text transformers-base
+         base containers exceptions hashable mtl protolude resourcet
+         semigroupoids semigroups text transformers-base
        ];
        testHaskellDepends = [
-         async base exceptions hedgehog hedgehog-corpus io-memoize
-         MonadRandom mtl protolude random resourcet tasty tasty-discover
-         tasty-hedgehog tasty-th text transformers-base
+         async base containers exceptions hashable hedgehog hedgehog-corpus
+         io-memoize MonadRandom mtl protolude random resourcet semigroupoids
+         semigroups tasty tasty-discover tasty-hedgehog tasty-th text
+         transformers-base
        ];
        testToolDepends = [ tasty-discover ];
        description = "data structure for assembling components";
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "registry_0_1_2_3" = callPackage
+  "registry_0_1_2_6" = callPackage
     ({ mkDerivation, async, base, containers, exceptions, hashable
      , hedgehog, hedgehog-corpus, io-memoize, MonadRandom, mtl
      , protolude, random, resourcet, semigroupoids, semigroups, tasty
@@ -179337,8 +179451,8 @@ self: {
      }:
      mkDerivation {
        pname = "registry";
-       version = "0.1.2.3";
-       sha256 = "17jzvbig0zcmhb1vf2g286px35j3kh544rpsap0094lmj9yac7ni";
+       version = "0.1.2.6";
+       sha256 = "0szzmk7rclzisz0ihs7cz6180wsfv6rkrfvvqk1v6das444y1bw3";
        libraryHaskellDepends = [
          base containers exceptions hashable mtl protolude resourcet
          semigroupoids semigroups text transformers-base
@@ -182819,6 +182933,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "RON, RON-RDT, and RON-Schema";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "roots" = callPackage
@@ -184550,22 +184665,21 @@ self: {
      }) {};
 
   "salak" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
-     , filepath, hspec, mtl, QuickCheck, scientific, text, transformers
+    ({ mkDerivation, aeson, base, directory, filepath, hspec, menshen
+     , mtl, QuickCheck, scientific, stm, text, transformers
      , unordered-containers, vector, yaml
      }:
      mkDerivation {
        pname = "salak";
-       version = "0.1.7";
-       sha256 = "1r937yil04n28dxggwp12kzs40nvmfrhcm1m77cg9k244ka415k6";
+       version = "0.1.8";
+       sha256 = "1y8vssnp8q9hmhf3jckj8c7pgjmvz4wmvm8m5xwlnn9ll8csxs0q";
        libraryHaskellDepends = [
-         aeson base directory filepath mtl scientific text transformers
-         unordered-containers vector yaml
+         aeson base directory filepath menshen mtl scientific stm text
+         transformers unordered-containers vector yaml
        ];
        testHaskellDepends = [
-         aeson aeson-pretty base bytestring directory filepath hspec mtl
-         QuickCheck scientific text transformers unordered-containers vector
-         yaml
+         aeson base directory filepath hspec menshen mtl QuickCheck
+         scientific stm text transformers unordered-containers vector yaml
        ];
        description = "Configuration Loader";
        license = stdenv.lib.licenses.bsd3;
@@ -188661,6 +188775,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-client-namedargs" = callPackage
+    ({ mkDerivation, async, base, hspec, http-client, named, QuickCheck
+     , servant, servant-client, servant-client-core, servant-namedargs
+     , servant-server, servant-server-namedargs, text, warp
+     }:
+     mkDerivation {
+       pname = "servant-client-namedargs";
+       version = "0.1.0.0";
+       sha256 = "0smf6ahmzkbsnvgkji5jzj99sy8bgqz0zxx5k1y1ar82pd6m4qnd";
+       revision = "1";
+       editedCabalFile = "0kfhrikja6rvrn3m4c6w7dg28l17f2jx8rwswxiwzvmg2zmwbc1n";
+       libraryHaskellDepends = [
+         base named servant servant-client-core servant-namedargs text
+       ];
+       testHaskellDepends = [
+         async base hspec http-client named QuickCheck servant
+         servant-client servant-namedargs servant-server
+         servant-server-namedargs warp
+       ];
+       description = "Automatically derive API client functions with named and optional parameters";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-conduit" = callPackage
     ({ mkDerivation, base, base-compat, bytestring, conduit
      , http-client, http-media, mtl, resourcet, servant, servant-client
@@ -189158,31 +189296,6 @@ self: {
      }:
      mkDerivation {
        pname = "servant-kotlin";
-       version = "0.1.1.5";
-       sha256 = "0wgx3yc6ay84mlwjw28dfrn633lcmpmr0968h4ncl99xa8vz1wnv";
-       libraryHaskellDepends = [
-         base containers directory formatting lens servant servant-foreign
-         text time wl-pprint-text
-       ];
-       testHaskellDepends = [
-         aeson base containers directory formatting hspec http-api-data lens
-         servant servant-foreign text time wl-pprint-text
-       ];
-       benchmarkHaskellDepends = [
-         aeson base containers directory formatting http-api-data lens
-         servant servant-foreign shelly text time wl-pprint-text
-       ];
-       description = "Automatically derive Kotlin class to query servant webservices";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "servant-kotlin_0_1_1_6" = callPackage
-    ({ mkDerivation, aeson, base, containers, directory, formatting
-     , hspec, http-api-data, lens, servant, servant-foreign, shelly
-     , text, time, wl-pprint-text
-     }:
-     mkDerivation {
-       pname = "servant-kotlin";
        version = "0.1.1.6";
        sha256 = "0v16y6f956yf64npq8fm1q6j1q8yygci3amsxyvrggs1rdd8hi31";
        libraryHaskellDepends = [
@@ -189199,7 +189312,6 @@ self: {
        ];
        description = "Automatically derive Kotlin class to query servant webservices";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-lucid" = callPackage
@@ -189346,6 +189458,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-namedargs" = callPackage
+    ({ mkDerivation, base, hspec, named, QuickCheck, servant, text }:
+     mkDerivation {
+       pname = "servant-namedargs";
+       version = "0.1.0.1";
+       sha256 = "0ylxcl11wmi3il5bpl7qc32qh2s210xfp37vfhhvnlxzgdzj84vh";
+       revision = "1";
+       editedCabalFile = "0nr11syaq0l04qdwh5ac0gnpfcgi9vakfjgv5i6p6kraag8za5k7";
+       libraryHaskellDepends = [ base named servant text ];
+       testHaskellDepends = [ base hspec named QuickCheck servant ];
+       description = "Combinators for servant providing named parameters";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-nix" = callPackage
     ({ mkDerivation, base, bytestring, hnix, http-client, http-media
      , servant, servant-client, servant-server, text, wai, warp
@@ -189385,15 +189512,17 @@ self: {
 
   "servant-pagination" = callPackage
     ({ mkDerivation, base, hspec, QuickCheck, safe, servant
-     , servant-server, text
+     , servant-server, text, uri-encode
      }:
      mkDerivation {
        pname = "servant-pagination";
-       version = "2.1.3";
-       sha256 = "152kp27p1zj0h7gm37skb0kghw9db3nbfrfcdsgp98gll81lyd54";
+       version = "2.2.0";
+       sha256 = "15imbn6iyvbi80yainpi59q2r621r43d6cim3aydf6bbmz9pgnxd";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base safe servant servant-server text ];
+       libraryHaskellDepends = [
+         base safe servant servant-server text uri-encode
+       ];
        testHaskellDepends = [ base hspec QuickCheck servant-server text ];
        description = "Type-safe pagination for Servant APIs";
        license = stdenv.lib.licenses.lgpl3;
@@ -189720,6 +189849,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-server-namedargs" = callPackage
+    ({ mkDerivation, base, http-api-data, http-types, named, servant
+     , servant-namedargs, servant-server, string-conversions, text, wai
+     }:
+     mkDerivation {
+       pname = "servant-server-namedargs";
+       version = "0.1.0.0";
+       sha256 = "0ncrrl91b8bcih4qf7gwl7m2qqmx6glwgvwcd4rvi1kdjrry8w0y";
+       revision = "1";
+       editedCabalFile = "1yf69y0w8miwcgdq9f88c2vabmqbn85rqsr8pqhijz24byyxnnl7";
+       libraryHaskellDepends = [
+         base http-api-data http-types named servant servant-namedargs
+         servant-server string-conversions text wai
+       ];
+       description = "Automatically derive API server functions with named and optional parameters";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-smsc-ru" = callPackage
     ({ mkDerivation, aeson, base, bytestring, http-client
      , http-client-tls, HUnit, mtl, QuickCheck, quickcheck-text
@@ -193018,26 +193166,6 @@ self: {
      }:
      mkDerivation {
        pname = "simple-log";
-       version = "0.9.10";
-       sha256 = "19gznqypfx452xmspvp1my5z39r6sk7g0cj5p245x806krjfi65k";
-       libraryHaskellDepends = [
-         async base base-unicode-symbols containers data-default deepseq
-         directory exceptions filepath hformat microlens microlens-platform
-         mmorph mtl SafeSemaphore text time transformers
-       ];
-       testHaskellDepends = [ base hspec microlens-platform text ];
-       description = "Simple log for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "simple-log_0_9_11" = callPackage
-    ({ mkDerivation, async, base, base-unicode-symbols, containers
-     , data-default, deepseq, directory, exceptions, filepath, hformat
-     , hspec, microlens, microlens-platform, mmorph, mtl, SafeSemaphore
-     , text, time, transformers
-     }:
-     mkDerivation {
-       pname = "simple-log";
        version = "0.9.11";
        sha256 = "1mqibcpcnwc0hqbcbvl32vv4458n02f2k2bnparh8ajm5n9h0cjk";
        libraryHaskellDepends = [
@@ -193048,7 +193176,6 @@ self: {
        testHaskellDepends = [ base hspec microlens-platform text ];
        description = "Simple log for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-log-syslog" = callPackage
@@ -193246,25 +193373,6 @@ self: {
      }:
      mkDerivation {
        pname = "simple-sendfile";
-       version = "0.2.27";
-       sha256 = "1bwwqzcm56m2w4ymsa054sxmpbj76h9pvb0jf8zxp8lr41cp51gn";
-       revision = "2";
-       editedCabalFile = "1590hn309h3jndahqh8ddrrn0jvag51al8jgb2p5l9m5r1ipn3i5";
-       libraryHaskellDepends = [ base bytestring network unix ];
-       testHaskellDepends = [
-         base bytestring conduit conduit-extra directory hspec HUnit network
-         process resourcet unix
-       ];
-       description = "Cross platform library for the sendfile system call";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "simple-sendfile_0_2_28" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, conduit-extra
-     , directory, hspec, HUnit, network, process, resourcet, unix
-     }:
-     mkDerivation {
-       pname = "simple-sendfile";
        version = "0.2.28";
        sha256 = "0w4qn8dslcky7cq36jjjnlqwl2s46m8q1cwk3hc9cf0wsiwhp059";
        libraryHaskellDepends = [ base bytestring network unix ];
@@ -193274,7 +193382,6 @@ self: {
        ];
        description = "Cross platform library for the sendfile system call";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-server" = callPackage
@@ -197065,6 +197172,7 @@ self: {
        benchmarkHaskellDepends = [ base ip primitive ];
        description = "High-level network sockets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "socketson" = callPackage
@@ -198011,6 +198119,7 @@ self: {
        ];
        description = "Library for spectral clustering";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "speculate" = callPackage
@@ -200596,28 +200705,6 @@ self: {
      }:
      mkDerivation {
        pname = "static-text";
-       version = "0.2.0.3";
-       sha256 = "189x85skhzms3iydzh4gd5hmklx7ps2skzymls514drg8cz7m7ar";
-       libraryHaskellDepends = [
-         base bytestring template-haskell text vector
-       ];
-       testHaskellDepends = [
-         base bytestring doctest doctest-driver-gen markdown-unlit tasty
-         tasty-hunit template-haskell
-       ];
-       testToolDepends = [ markdown-unlit ];
-       description = "Lists, Texts, ByteStrings and Vectors of statically known length";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "static-text_0_2_0_4" = callPackage
-    ({ mkDerivation, base, bytestring, doctest, doctest-driver-gen
-     , markdown-unlit, tasty, tasty-hunit, template-haskell, text
-     , vector
-     }:
-     mkDerivation {
-       pname = "static-text";
        version = "0.2.0.4";
        sha256 = "19d43v2cp6wg861lc6rvimzqq20via6fvradysapmilq7svs5kq7";
        libraryHaskellDepends = [
@@ -201808,15 +201895,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "stratosphere_0_30_0" = callPackage
+  "stratosphere_0_30_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
      , hashable, hspec, hspec-discover, lens, template-haskell, text
      , unordered-containers
      }:
      mkDerivation {
        pname = "stratosphere";
-       version = "0.30.0";
-       sha256 = "15cv5w93w6z1w5ry69iv0lab6qcdmwqvi0wyym4rigfs8ag3rrra";
+       version = "0.30.1";
+       sha256 = "1j2k4z5chi41fjf1shhci8yf6x5fyj1z5wa077n3n3m7hrlf3r76";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -207339,23 +207426,11 @@ self: {
     ({ mkDerivation, base, dejafu, random, tagged, tasty }:
      mkDerivation {
        pname = "tasty-dejafu";
-       version = "1.2.0.8";
-       sha256 = "0v9939w2vppa3zfgmyzgb4880cx5z9hw5cssg25qg6ymr6rczdr4";
-       libraryHaskellDepends = [ base dejafu random tagged tasty ];
-       description = "Deja Fu support for the Tasty test framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tasty-dejafu_1_2_1_0" = callPackage
-    ({ mkDerivation, base, dejafu, random, tagged, tasty }:
-     mkDerivation {
-       pname = "tasty-dejafu";
        version = "1.2.1.0";
        sha256 = "0a0iqc9vnrj4a44h77larcprydipwxy9qkh3zb6zk9mpn9fas498";
        libraryHaskellDepends = [ base dejafu random tagged tasty ];
        description = "Deja Fu support for the Tasty test framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-discover" = callPackage
@@ -208007,28 +208082,6 @@ self: {
      }:
      mkDerivation {
        pname = "tcp-streams";
-       version = "1.0.1.0";
-       sha256 = "0qa8dvlxg6r7f6qxq46xj1fq5ksbvznjqs624v57ay2nvgji5n3p";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base bytestring data-default-class io-streams network pem tls x509
-         x509-store x509-system
-       ];
-       testHaskellDepends = [
-         base bytestring directory HUnit io-streams network test-framework
-         test-framework-hunit
-       ];
-       description = "One stop solution for tcp client and server with tls support";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "tcp-streams_1_0_1_1" = callPackage
-    ({ mkDerivation, base, bytestring, data-default-class, directory
-     , HUnit, io-streams, network, pem, test-framework
-     , test-framework-hunit, tls, x509, x509-store, x509-system
-     }:
-     mkDerivation {
-       pname = "tcp-streams";
        version = "1.0.1.1";
        sha256 = "1dz21ycm06d9mwc6dbjr8ansl212ril3i5jl73yzkdi9ngj16qqa";
        enableSeparateDataOutput = true;
@@ -208042,7 +208095,6 @@ self: {
        ];
        description = "One stop solution for tcp client and server with tls support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tcp-streams-openssl" = callPackage
@@ -209123,6 +209175,7 @@ self: {
        testHaskellDepends = [ base QuickCheck time ];
        description = "Simple terminal-based time tracker";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "terminal-size" = callPackage
@@ -211635,6 +211688,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "these_0_7_6" = callPackage
+    ({ mkDerivation, aeson, base, base-compat, bifunctors, binary
+     , containers, data-default-class, deepseq, hashable, keys, lens
+     , mtl, QuickCheck, quickcheck-instances, semigroupoids, tasty
+     , tasty-quickcheck, transformers, transformers-compat
+     , unordered-containers, vector, vector-instances
+     }:
+     mkDerivation {
+       pname = "these";
+       version = "0.7.6";
+       sha256 = "0in77b1g73m224dmpfc9khgcs0ajgsknp0yri853c9p6k0yvhr4l";
+       libraryHaskellDepends = [
+         aeson base base-compat bifunctors binary containers
+         data-default-class deepseq hashable keys lens mtl QuickCheck
+         semigroupoids transformers transformers-compat unordered-containers
+         vector vector-instances
+       ];
+       testHaskellDepends = [
+         aeson base base-compat bifunctors binary containers hashable lens
+         QuickCheck quickcheck-instances tasty tasty-quickcheck transformers
+         unordered-containers vector
+       ];
+       description = "An either-or-both data type & a generalized 'zip with padding' typeclass";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "these-skinny" = callPackage
     ({ mkDerivation, base, deepseq }:
      mkDerivation {
@@ -211966,6 +212046,7 @@ self: {
        ];
        description = "Haskell bindings for the Apache Thrift RPC system";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "thrist" = callPackage
@@ -214126,6 +214207,141 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tonalude" = callPackage
+    ({ mkDerivation, base, bytestring, doctest, Glob, rio, unliftio }:
+     mkDerivation {
+       pname = "tonalude";
+       version = "0.1.1.0";
+       sha256 = "060hc1dydlq1zd1fn5scz7xhbflqm4fa86rz6275drymi5gwx82s";
+       libraryHaskellDepends = [ base bytestring rio unliftio ];
+       testHaskellDepends = [ base bytestring doctest Glob rio unliftio ];
+       description = "A standard library for Tonatona framework";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "tonaparser" = callPackage
+    ({ mkDerivation, base, doctest, envy, Glob, rio, say, tonatona }:
+     mkDerivation {
+       pname = "tonaparser";
+       version = "0.1.0.0";
+       sha256 = "0v9qfc13lyjclk7pqsld1lzzbdhimz7gziix7w2x6v2rr2nia8j0";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base envy rio say ];
+       testHaskellDepends = [ base doctest envy Glob rio say tonatona ];
+       description = "Scalable way to pass runtime configurations for tonatona";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "tonatona" = callPackage
+    ({ mkDerivation, base, doctest, Glob, rio, tonaparser }:
+     mkDerivation {
+       pname = "tonatona";
+       version = "0.1.0.1";
+       sha256 = "0vc2q0j26ig2qhrc8dfy0knsp0gj8p7yda4xaps5v51dsqpj9yfv";
+       libraryHaskellDepends = [ base rio tonaparser ];
+       testHaskellDepends = [ base doctest Glob rio tonaparser ];
+       description = "meta application framework";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "tonatona-google-server-api" = callPackage
+    ({ mkDerivation, base, doctest, Glob, google-server-api
+     , monad-logger, persistent, persistent-sqlite, resource-pool
+     , servant-client, tonalude, tonaparser, tonatona
+     }:
+     mkDerivation {
+       pname = "tonatona-google-server-api";
+       version = "0.1.0.0";
+       sha256 = "0mlzw51s4q3q7sf2hbx26g8chmicsv7nchqrq06x6f7ms58aiy27";
+       libraryHaskellDepends = [
+         base google-server-api monad-logger persistent persistent-sqlite
+         resource-pool servant-client tonalude tonaparser tonatona
+       ];
+       testHaskellDepends = [
+         base doctest Glob google-server-api monad-logger persistent
+         persistent-sqlite resource-pool servant-client tonalude tonaparser
+         tonatona
+       ];
+       description = "tonatona plugin for google-server-api";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "tonatona-logger" = callPackage
+    ({ mkDerivation, base, doctest, Glob, rio, tonaparser, tonatona }:
+     mkDerivation {
+       pname = "tonatona-logger";
+       version = "0.2.0.0";
+       sha256 = "14pirmflhyfmw6y7j1af7ryh8iq30prx7xsdjwmliacszhsqvvfa";
+       libraryHaskellDepends = [ base rio tonaparser tonatona ];
+       testHaskellDepends = [ base doctest Glob rio tonaparser tonatona ];
+       description = "tonatona plugin for logging";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "tonatona-persistent-postgresql" = callPackage
+    ({ mkDerivation, base, doctest, Glob, monad-logger, persistent
+     , persistent-postgresql, resource-pool, rio, tonaparser, tonatona
+     }:
+     mkDerivation {
+       pname = "tonatona-persistent-postgresql";
+       version = "0.1.0.1";
+       sha256 = "1fxf3h024bl02aldcwc9mhjish9l2y57ir9shra6liddk6065g5n";
+       libraryHaskellDepends = [
+         base monad-logger persistent persistent-postgresql resource-pool
+         rio tonaparser tonatona
+       ];
+       testHaskellDepends = [
+         base doctest Glob monad-logger persistent persistent-postgresql
+         resource-pool rio tonaparser tonatona
+       ];
+       description = "tonatona plugin for accessing PostgreSQL database";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "tonatona-persistent-sqlite" = callPackage
+    ({ mkDerivation, base, doctest, Glob, monad-logger, persistent
+     , persistent-sqlite, resource-pool, rio, tonaparser, tonatona
+     }:
+     mkDerivation {
+       pname = "tonatona-persistent-sqlite";
+       version = "0.1.0.1";
+       sha256 = "0a0jgi01pdirr7ay2ah3cvf3nv2pnmvxag34zif04vc6sbs8pryb";
+       libraryHaskellDepends = [
+         base monad-logger persistent persistent-sqlite resource-pool rio
+         tonaparser tonatona
+       ];
+       testHaskellDepends = [
+         base doctest Glob monad-logger persistent persistent-sqlite
+         resource-pool rio tonaparser tonatona
+       ];
+       description = "tonatona plugin for accessing Sqlite database";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "tonatona-servant" = callPackage
+    ({ mkDerivation, base, doctest, exceptions, Glob, http-types
+     , monad-logger, rio, servant, servant-server, tonaparser, tonatona
+     , tonatona-logger, wai, wai-extra, warp
+     }:
+     mkDerivation {
+       pname = "tonatona-servant";
+       version = "0.1.0.1";
+       sha256 = "1202fxvjkmvj9sgy576y0ghpcqdca1bhagsxrrz3hcdkyvd2lr9s";
+       libraryHaskellDepends = [
+         base exceptions http-types monad-logger rio servant servant-server
+         tonaparser tonatona tonatona-logger wai wai-extra warp
+       ];
+       testHaskellDepends = [
+         base doctest exceptions Glob http-types monad-logger rio servant
+         servant-server tonaparser tonatona tonatona-logger wai wai-extra
+         warp
+       ];
+       description = "tonatona plugin for servant";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "too-many-cells" = callPackage
     ({ mkDerivation, aeson, base, birch-beer, bytestring, cassava
      , colour, containers, deepseq, diagrams, diagrams-cairo
@@ -214166,34 +214382,36 @@ self: {
        ];
        description = "Cluster single cells and analyze cell clade relationships";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "toodles" = callPackage
-    ({ mkDerivation, aeson, base, blaze-html, cmdargs, directory, hspec
-     , hspec-expectations, megaparsec, MissingH, regex-posix, servant
-     , servant-blaze, servant-server, strict, text, wai, warp, yaml
+    ({ mkDerivation, aeson, base, blaze-html, cmdargs, directory, extra
+     , hspec, hspec-expectations, megaparsec, MissingH, regex-posix
+     , servant, servant-blaze, servant-server, strict, text, wai, warp
+     , yaml
      }:
      mkDerivation {
        pname = "toodles";
-       version = "1.0.2";
-       sha256 = "066nc1xgy9g7w82f0s1lagxjpf5hw9zxpnbcf5lbjdj58ssrkdr5";
+       version = "1.0.3";
+       sha256 = "1nzrfdbwz5ykiim76jr3v1666acrhh76k4q4gwix9bixcm8al2zf";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         aeson base blaze-html cmdargs directory hspec hspec-expectations
-         megaparsec MissingH regex-posix servant servant-blaze
-         servant-server strict text wai warp yaml
+         aeson base blaze-html cmdargs directory extra hspec
+         hspec-expectations megaparsec MissingH regex-posix servant
+         servant-blaze servant-server strict text wai warp yaml
        ];
        executableHaskellDepends = [
-         aeson base blaze-html cmdargs directory hspec hspec-expectations
-         megaparsec MissingH regex-posix servant servant-blaze
-         servant-server strict text wai warp yaml
+         aeson base blaze-html cmdargs directory extra hspec
+         hspec-expectations megaparsec MissingH regex-posix servant
+         servant-blaze servant-server strict text wai warp yaml
        ];
        testHaskellDepends = [
-         aeson base blaze-html cmdargs directory hspec hspec-expectations
-         megaparsec MissingH regex-posix servant servant-blaze
-         servant-server strict text wai warp yaml
+         aeson base blaze-html cmdargs directory extra hspec
+         hspec-expectations megaparsec MissingH regex-posix servant
+         servant-blaze servant-server strict text wai warp yaml
        ];
        description = "Manage the TODO entries in your code";
        license = stdenv.lib.licenses.mit;
@@ -214676,8 +214894,8 @@ self: {
      }:
      mkDerivation {
        pname = "trackit";
-       version = "0.5";
-       sha256 = "1vzq0jfa9dxaqpkk0wipd3jmppdkr0jypb2463b63qzb0jc6f05n";
+       version = "0.6";
+       sha256 = "0944m0s1r2f53m9cmfw7jzv4xxgrfppy0cnh0a98j129n6xn39sq";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -215402,6 +215620,8 @@ self: {
        pname = "tree-diff";
        version = "0.0.2";
        sha256 = "0zlviaikyk50l577q7h06w5z058v1ngjlhwzfn965xkp978hnsgq";
+       revision = "1";
+       editedCabalFile = "1rl12a2ydg744s289lna4zb0sj0b16abmrngp6qd1kfkih2ygml0";
        libraryHaskellDepends = [
          aeson ansi-terminal ansi-wl-pprint base base-compat bytestring
          containers generics-sop hashable MemoTrie parsec parsers pretty
@@ -215674,6 +215894,8 @@ self: {
        pname = "trifecta";
        version = "2";
        sha256 = "0hznd8i65s81xy13i2qc7cvipw3lfb2yhkv53apbdsh6sbljz5sk";
+       revision = "1";
+       editedCabalFile = "1qqkiwy0yvnj4yszsw9jrv83qf5hw87jdqdb34401dskaf81gwrm";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html
@@ -217885,6 +218107,7 @@ self: {
        ];
        description = "Admin console framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "typed-duration" = callPackage
@@ -218137,35 +218360,6 @@ self: {
   "typerep-map" = callPackage
     ({ mkDerivation, base, containers, criterion, deepseq
      , dependent-map, dependent-sum, ghc-prim, ghc-typelits-knownnat
-     , hedgehog, primitive, tasty, tasty-discover, tasty-hedgehog
-     , tasty-hspec, vector
-     }:
-     mkDerivation {
-       pname = "typerep-map";
-       version = "0.3.0";
-       sha256 = "0d5a2zfb75fallp9q8sz1av8ncvsnmqg6dfjqcghz0grfpwmn7bf";
-       revision = "1";
-       editedCabalFile = "102lwg5rl1628j3v331xj93cgvr9ppmphyjlqli4gm5vxgrkwsfv";
-       libraryHaskellDepends = [
-         base containers ghc-prim primitive vector
-       ];
-       testHaskellDepends = [
-         base ghc-typelits-knownnat hedgehog tasty tasty-discover
-         tasty-hedgehog tasty-hspec
-       ];
-       testToolDepends = [ tasty-discover ];
-       benchmarkHaskellDepends = [
-         base criterion deepseq dependent-map dependent-sum
-         ghc-typelits-knownnat
-       ];
-       doHaddock = false;
-       description = "Efficient implementation of a dependent map with types as keys";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "typerep-map_0_3_1" = callPackage
-    ({ mkDerivation, base, containers, criterion, deepseq
-     , dependent-map, dependent-sum, ghc-prim, ghc-typelits-knownnat
      , hedgehog, primitive, QuickCheck, tasty, tasty-discover
      , tasty-hedgehog, tasty-hspec, vector
      }:
@@ -218190,7 +218384,6 @@ self: {
        doHaddock = false;
        description = "Efficient implementation of a dependent map with types as keys";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "types-compat" = callPackage
@@ -218275,8 +218468,8 @@ self: {
      }:
      mkDerivation {
        pname = "typograffiti";
-       version = "0.1.0.2";
-       sha256 = "1i7my9vqkabwxsj6hp9alvlpb483vs07f07662i707kpqf5pryrz";
+       version = "0.1.0.3";
+       sha256 = "16491jhiw8yvs1491plf5c98rarxk0j2dfy76ggayxypzqdn2rmr";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -220102,23 +220295,6 @@ self: {
      }) {};
 
   "unix-time" = callPackage
-    ({ mkDerivation, base, binary, bytestring, Cabal, cabal-doctest
-     , doctest, hspec, old-locale, old-time, QuickCheck, time
-     }:
-     mkDerivation {
-       pname = "unix-time";
-       version = "0.4.4";
-       sha256 = "1hgh7v2xcscd69hdbnijp0bh0h1gg9y4qygp7bzwapmlckk3cihx";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [ base binary bytestring old-time ];
-       testHaskellDepends = [
-         base bytestring doctest hspec old-locale old-time QuickCheck time
-       ];
-       description = "Unix time parser/formatter and utilities";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "unix-time_0_4_5" = callPackage
     ({ mkDerivation, base, binary, bytestring, hspec, hspec-discover
      , old-locale, old-time, QuickCheck, time
      }:
@@ -220133,7 +220309,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Unix time parser/formatter and utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unjson" = callPackage
@@ -224583,23 +224758,6 @@ self: {
      }:
      mkDerivation {
        pname = "wai";
-       version = "3.2.1.2";
-       sha256 = "0jr3b2789wa4m6mxkz12ynz4lfsqmgbrcy0am8karyqr3x3528r8";
-       libraryHaskellDepends = [
-         base bytestring http-types network text transformers vault
-       ];
-       testHaskellDepends = [ base bytestring hspec ];
-       testToolDepends = [ hspec-discover ];
-       description = "Web Application Interface";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "wai_3_2_2" = callPackage
-    ({ mkDerivation, base, bytestring, hspec, hspec-discover
-     , http-types, network, text, transformers, vault
-     }:
-     mkDerivation {
-       pname = "wai";
        version = "3.2.2";
        sha256 = "1qbzq4k8b23pg1knw5y99rdvkfywnncwqkfrkp2w7g6p054xar1a";
        libraryHaskellDepends = [
@@ -224609,7 +224767,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Web Application Interface";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-accept-language" = callPackage
@@ -224851,35 +225008,6 @@ self: {
      }:
      mkDerivation {
        pname = "wai-extra";
-       version = "3.0.24.3";
-       sha256 = "0ff4mzxqj3h5zn27q9pq0q89x087dy072z24bczn4irry0zzks21";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson ansi-terminal base base64-bytestring bytestring
-         case-insensitive containers cookie data-default-class deepseq
-         directory fast-logger http-types iproute network old-locale
-         resourcet streaming-commons text time transformers unix unix-compat
-         vault void wai wai-logger word8 zlib
-       ];
-       testHaskellDepends = [
-         base bytestring case-insensitive cookie fast-logger hspec
-         http-types HUnit resourcet text time transformers wai zlib
-       ];
-       description = "Provides some basic WAI handlers and middleware";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "wai-extra_3_0_25" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
-     , bytestring, case-insensitive, containers, cookie
-     , data-default-class, deepseq, directory, fast-logger, hspec
-     , http-types, HUnit, iproute, network, old-locale, resourcet
-     , streaming-commons, text, time, transformers, unix, unix-compat
-     , vault, void, wai, wai-logger, word8, zlib
-     }:
-     mkDerivation {
-       pname = "wai-extra";
        version = "3.0.25";
        sha256 = "0caz1miwnyjqg6gdfgv7ibyfdyjzlq2i8v07zhan1nniv9pj3w6y";
        isLibrary = true;
@@ -224897,7 +225025,6 @@ self: {
        ];
        description = "Provides some basic WAI handlers and middleware";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-frontend-monadcgi" = callPackage
@@ -226401,42 +226528,6 @@ self: {
      }:
      mkDerivation {
        pname = "warp";
-       version = "3.2.25";
-       sha256 = "0rl59bs99c3wwwyc1ibq0v11mkc7pxpy28r9hdlmjsqmdwn8y2vy";
-       revision = "1";
-       editedCabalFile = "0q0l9s1c9m20g7j6lgrj7d3l0awr3hc35bvm95an61hg18cilngj";
-       libraryHaskellDepends = [
-         array async auto-update base bsb-http-chunked bytestring
-         case-insensitive containers ghc-prim hashable http-date http-types
-         http2 iproute network simple-sendfile stm streaming-commons text
-         unix unix-compat vault wai word8
-       ];
-       testHaskellDepends = [
-         array async auto-update base bsb-http-chunked bytestring
-         case-insensitive containers directory doctest ghc-prim hashable
-         hspec http-client http-date http-types http2 HUnit iproute
-         lifted-base network process QuickCheck silently simple-sendfile stm
-         streaming-commons text time transformers unix unix-compat vault wai
-         word8
-       ];
-       benchmarkHaskellDepends = [
-         auto-update base bytestring containers gauge hashable http-date
-         http-types network unix unix-compat
-       ];
-       description = "A fast, light-weight web server for WAI applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "warp_3_2_26" = callPackage
-    ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked
-     , bytestring, case-insensitive, containers, directory, doctest
-     , gauge, ghc-prim, hashable, hspec, http-client, http-date
-     , http-types, http2, HUnit, iproute, lifted-base, network, process
-     , QuickCheck, silently, simple-sendfile, stm, streaming-commons
-     , text, time, transformers, unix, unix-compat, vault, wai, word8
-     }:
-     mkDerivation {
-       pname = "warp";
        version = "3.2.26";
        sha256 = "1s83313cs6w84a8yfwqkixfz4a94aszma4phsqv7x1ivi9b3i8sc";
        libraryHaskellDepends = [
@@ -226459,7 +226550,6 @@ self: {
        ];
        description = "A fast, light-weight web server for WAI applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "warp-dynamic" = callPackage
@@ -226692,6 +226782,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wave_0_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, containers, hspec
+     , hspec-discover, QuickCheck, temporary, transformers
+     }:
+     mkDerivation {
+       pname = "wave";
+       version = "0.2.0";
+       sha256 = "149kgwngq3qxc7gxpkqb16j669j0wpv2f3gnvfwp58yg6m4259ki";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base bytestring cereal containers transformers
+       ];
+       testHaskellDepends = [
+         base bytestring containers hspec QuickCheck temporary
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Work with WAVE and RF64 files";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wavefront" = callPackage
     ({ mkDerivation, attoparsec, base, dlist, filepath, mtl, text
      , transformers, vector
@@ -227145,40 +227256,6 @@ self: {
      }:
      mkDerivation {
        pname = "web3";
-       version = "0.8.3.0";
-       sha256 = "1g97dv41widcl612zi49mqf9f61zwp23ml0xf5kw9ac51c683s1q";
-       libraryHaskellDepends = [
-         aeson async base basement bytestring cereal cryptonite data-default
-         exceptions generics-sop http-client http-client-tls machines memory
-         microlens microlens-aeson microlens-mtl microlens-th mtl OneTuple
-         parsec relapse tagged template-haskell text transformers uuid-types
-         vinyl
-       ];
-       testHaskellDepends = [
-         aeson async base basement bytestring cereal cryptonite data-default
-         exceptions generics-sop hspec hspec-contrib hspec-discover
-         hspec-expectations http-client http-client-tls machines memory
-         microlens microlens-aeson microlens-mtl microlens-th mtl OneTuple
-         parsec random relapse split stm tagged template-haskell text time
-         transformers uuid-types vinyl
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Ethereum API for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "web3_0_8_3_1" = callPackage
-    ({ mkDerivation, aeson, async, base, basement, bytestring, cereal
-     , cryptonite, data-default, exceptions, generics-sop, hspec
-     , hspec-contrib, hspec-discover, hspec-expectations, http-client
-     , http-client-tls, machines, memory, microlens, microlens-aeson
-     , microlens-mtl, microlens-th, mtl, OneTuple, parsec, random
-     , relapse, split, stm, tagged, template-haskell, text, time
-     , transformers, uuid-types, vinyl
-     }:
-     mkDerivation {
-       pname = "web3";
        version = "0.8.3.1";
        sha256 = "1pvyyvaamxjz2pyxz25sw3f8hv8605qg99qpgx40bhbhrfvg8zpi";
        libraryHaskellDepends = [
@@ -227665,13 +227742,13 @@ self: {
     ({ mkDerivation, base, blaze-html, data-default, lucid, text }:
      mkDerivation {
        pname = "webpage";
-       version = "0.0.5";
-       sha256 = "1b8s7nnzyadla3wl6p58dwhinscajp5p0ajkrfz5hzqxjgzr4gi1";
+       version = "0.0.5.1";
+       sha256 = "1nbnpqbknfgw9pyj0phgc9g5srwdzzga3vy58yin25xvkzj2grfr";
        libraryHaskellDepends = [
          base blaze-html data-default lucid text
        ];
        description = "Organized and simple web page scaffold for blaze and lucid";
-       license = stdenv.lib.licenses.mit;
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -229932,20 +230009,6 @@ self: {
      }:
      mkDerivation {
        pname = "wuss";
-       version = "1.1.11";
-       sha256 = "1mlqgi80r5db0j58r0laiwp1044n4insq89bv1v3y26j726yjvp0";
-       libraryHaskellDepends = [
-         base bytestring connection network websockets
-       ];
-       description = "Secure WebSocket (WSS) clients";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "wuss_1_1_12" = callPackage
-    ({ mkDerivation, base, bytestring, connection, network, websockets
-     }:
-     mkDerivation {
-       pname = "wuss";
        version = "1.1.12";
        sha256 = "1xnnyavkgf2cdnsm494bl1z275l9rynh9s3djq3mqk6lrr4bvsix";
        libraryHaskellDepends = [
@@ -229953,7 +230016,6 @@ self: {
        ];
        description = "Secure WebSocket (WSS) clients";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wx" = callPackage
@@ -230323,7 +230385,7 @@ self: {
        ];
        description = "Haskell extended file attributes interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) attr;};
 
   "xbattbar" = callPackage
@@ -232008,6 +232070,24 @@ self: {
        license = "LGPL";
      }) {};
 
+  "xorshift-plus" = callPackage
+    ({ mkDerivation, base, doctest, gauge, ghc-prim, hspec
+     , hspec-discover, QuickCheck, random, xorshift, Xorshift128Plus
+     }:
+     mkDerivation {
+       pname = "xorshift-plus";
+       version = "0.1.0.0";
+       sha256 = "1m0wilg47jv9zsklghcs1h9bf4vykn8r4bwl0ncr7cqrlfa8d94l";
+       libraryHaskellDepends = [ base ghc-prim ];
+       testHaskellDepends = [ base doctest hspec QuickCheck ];
+       testToolDepends = [ hspec-discover ];
+       benchmarkHaskellDepends = [
+         base gauge random xorshift Xorshift128Plus
+       ];
+       description = "Simple implementation of xorshift+ PRNG";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "xosd" = callPackage
     ({ mkDerivation, base, xosd }:
      mkDerivation {
@@ -232553,6 +232633,7 @@ self: {
        ];
        description = "Yam DataSource Middleware";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yam-job" = callPackage
@@ -233219,6 +233300,7 @@ self: {
        ];
        description = "Total recursion schemes";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yaya-hedgehog" = callPackage
@@ -233246,6 +233328,7 @@ self: {
        testHaskellDepends = [ base hedgehog yaya yaya-hedgehog ];
        description = "Non-total extensions to the Yaya recursion scheme library";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ycextra" = callPackage
@@ -234093,42 +234176,6 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-core";
-       version = "1.6.9";
-       sha256 = "0jwfxcp0hdp1lw63gcqpqbvdrzifyds3x42wk0m5wxy7hj0x0r6a";
-       libraryHaskellDepends = [
-         aeson auto-update base blaze-html blaze-markup byteable bytestring
-         case-insensitive cereal clientsession conduit conduit-extra
-         containers cookie deepseq fast-logger http-types monad-logger mtl
-         parsec path-pieces primitive random resourcet rio shakespeare
-         template-haskell text time transformers unix-compat unliftio
-         unordered-containers vector wai wai-extra wai-logger warp word8
-       ];
-       testHaskellDepends = [
-         async base bytestring clientsession conduit conduit-extra
-         containers cookie hspec hspec-expectations http-types HUnit network
-         path-pieces random resourcet shakespeare streaming-commons
-         template-haskell text transformers unliftio wai wai-extra warp
-       ];
-       benchmarkHaskellDepends = [
-         base blaze-html bytestring gauge shakespeare text
-       ];
-       description = "Creation of type-safe, RESTful web applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-core_1_6_10_1" = callPackage
-    ({ mkDerivation, aeson, async, auto-update, base, blaze-html
-     , blaze-markup, byteable, bytestring, case-insensitive, cereal
-     , clientsession, conduit, conduit-extra, containers, cookie
-     , deepseq, fast-logger, gauge, hspec, hspec-expectations
-     , http-types, HUnit, monad-logger, mtl, network, parsec
-     , path-pieces, primitive, random, resourcet, rio, shakespeare
-     , streaming-commons, template-haskell, text, time, transformers
-     , unix-compat, unliftio, unordered-containers, vector, wai
-     , wai-extra, wai-logger, warp, word8
-     }:
-     mkDerivation {
-       pname = "yesod-core";
        version = "1.6.10.1";
        sha256 = "0xkfzdy1r07w7xqai4r5b96rrk51gr5ndwrf20nhdnjjms4928li";
        libraryHaskellDepends = [
@@ -234150,7 +234197,6 @@ self: {
        ];
        description = "Creation of type-safe, RESTful web applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-crud" = callPackage
@@ -234420,28 +234466,6 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-form";
-       version = "1.6.3";
-       sha256 = "15wvgrkqp57wrh8xv1ix86navy6llvagwp393w4b6azv758dims0";
-       libraryHaskellDepends = [
-         aeson attoparsec base blaze-builder blaze-html blaze-markup
-         byteable bytestring containers data-default email-validate
-         network-uri persistent resourcet semigroups shakespeare text time
-         transformers wai xss-sanitize yesod-core yesod-persistent
-       ];
-       testHaskellDepends = [ base hspec text time ];
-       description = "Form handling support for Yesod Web Framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-form_1_6_4" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
-     , blaze-markup, byteable, bytestring, containers, data-default
-     , email-validate, hspec, network-uri, persistent, resourcet
-     , semigroups, shakespeare, text, time, transformers, wai
-     , xss-sanitize, yesod-core, yesod-persistent
-     }:
-     mkDerivation {
-       pname = "yesod-form";
        version = "1.6.4";
        sha256 = "0iqcrbmwhgfk78qi2n1n3i39izqr7km4i8fa1zmvplqkcbyi149c";
        libraryHaskellDepends = [
@@ -234453,7 +234477,6 @@ self: {
        testHaskellDepends = [ base hspec text time ];
        description = "Form handling support for Yesod Web Framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-form-bootstrap4" = callPackage
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index e36933a8194..b4cd7fee311 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -176,6 +176,17 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
 
     callHackage = name: version: callPackageKeepDeriver (self.hackage2nix name version);
 
+    # This function does not depend on all-cabal-hashes and therefore will work
+    # for any version that has been released on hackage as opposed to only
+    # versions released before whatever version of all-cabal-hashes you happen
+    # to be currently using.
+    callHackageDirect = {pkg, ver, sha256}@args:
+      let pkgver = "${pkg}-${ver}";
+      in self.callCabal2nix pkg (pkgs.fetchzip {
+           url = "http://hackage.haskell.org/package/${pkgver}/${pkgver}.tar.gz";
+           inherit sha256;
+         });
+
     # Creates a Haskell package from a source package by calling cabal2nix on the source.
     callCabal2nixWithOptions = name: src: extraCabal2nixOptions: args:
       let
diff --git a/pkgs/development/haskell-modules/stack-hook.sh b/pkgs/development/haskell-modules/stack-hook.sh
new file mode 100644
index 00000000000..d942662294c
--- /dev/null
+++ b/pkgs/development/haskell-modules/stack-hook.sh
@@ -0,0 +1,11 @@
+addStackArgs () {
+  if [ -d "$1/lib" ] && [[ "$STACK_IN_NIX_EXTRA_ARGS" != *"--extra-lib-dirs=$1/lib"* ]]; then
+    STACK_IN_NIX_EXTRA_ARGS+=" --extra-lib-dirs=$1/lib"
+  fi
+
+  if [ -d "$1/include" ] && [[ "$STACK_IN_NIX_EXTRA_ARGS" != *"--extra-include-dirs=$1/include"* ]]; then
+    STACK_IN_NIX_EXTRA_ARGS+=" --extra-include-dirs=$1/include"
+  fi
+}
+
+addEnvHooks "$hostOffset" addStackArgs
diff --git a/pkgs/development/interpreters/elixir/1.8.nix b/pkgs/development/interpreters/elixir/1.8.nix
index 65c008f8ac6..40136fd22de 100644
--- a/pkgs/development/interpreters/elixir/1.8.nix
+++ b/pkgs/development/interpreters/elixir/1.8.nix
@@ -1,7 +1,7 @@
 { mkDerivation }:
 
 mkDerivation rec {
-  version = "1.8.0-rc.1";
-  sha256 = "06k9q46cwn79ic6kw0b0mskf9rqlgm02jb8n1ajz55kmw134kq6m";
+  version = "1.8.1";
+  sha256 = "1npnrkn21kqqfqrsn06mr78jxs6n5l8c935jpxvnmj7iysp50pf9";
   minimumOTPVersion = "20";
 }
diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix
index b4e1cacfe26..844d6eeb4fb 100644
--- a/pkgs/development/interpreters/elixir/generic-builder.nix
+++ b/pkgs/development/interpreters/elixir/generic-builder.nix
@@ -7,7 +7,7 @@
 , sha256 ? null
 , rev ? "v${version}"
 , src ? fetchFromGitHub { inherit rev sha256; owner = "elixir-lang"; repo = "elixir"; }
-}:
+} @ args:
 
 let
   inherit (stdenv.lib) getVersion versionAtLeast;
@@ -62,6 +62,7 @@ in
             --replace "/usr/bin/env elixir" "${coreutils}/bin/env elixir"
     '';
 
+    pos = builtins.unsafeGetAttrPos "sha256" args;
     meta = with stdenv.lib; {
       homepage = https://elixir-lang.org/;
       description = "A functional, meta-programming aware language built on top of the Erlang VM";
diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix
index 09af492490c..b2948b392d5 100644
--- a/pkgs/development/interpreters/lua-5/5.1.nix
+++ b/pkgs/development/interpreters/lua-5/5.1.nix
@@ -1,4 +1,8 @@
-{ stdenv, fetchurl, readline }:
+{ stdenv, fetchurl, readline
+, self
+, callPackage
+, packageOverrides ? (self: super: {})
+}:
 
 let
   dsoPatch = fetchurl {
@@ -6,6 +10,7 @@ let
     sha256 = "11fcyb4q55p4p7kdb8yp85xlw8imy14kzamp2khvcyxss4vw8ipw";
     name = "lua-arch.patch";
   };
+  luaPackages = callPackage ../../lua-modules {lua=self; overrides=packageOverrides;};
 in
 stdenv.mkDerivation rec {
   name = "lua-${version}";
@@ -17,6 +22,10 @@ stdenv.mkDerivation rec {
     sha256 = "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333";
   };
 
+  LuaPathSearchPaths    = luaPackages.getLuaPathList luaversion;
+  LuaCPathSearchPaths   = luaPackages.getLuaCPathList luaversion;
+  setupHook = luaPackages.lua-setup-hook LuaPathSearchPaths LuaCPathSearchPaths;
+
   buildInputs = [ readline ];
 
   patches = (if stdenv.isDarwin then [ ./5.1.darwin.patch ] else [ dsoPatch ])
@@ -39,6 +48,16 @@ stdenv.mkDerivation rec {
     rmdir $out/{share,lib}/lua/5.1 $out/{share,lib}/lua
   '';
 
+  passthru = rec {
+    buildEnv = callPackage ./wrapper.nix {
+      lua=self;
+      inherit (luaPackages) requiredLuaModules;
+    };
+    withPackages = import ./with-packages.nix { inherit buildEnv luaPackages;};
+    pkgs = luaPackages;
+    interpreter = "${self}/bin/lua";
+  };
+
   meta = {
     homepage = http://www.lua.org;
     description = "Powerful, fast, lightweight, embeddable scripting language";
@@ -51,6 +70,7 @@ stdenv.mkDerivation rec {
       for configuration, scripting, and rapid prototyping.
     '';
     license = stdenv.lib.licenses.mit;
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
     hydraPlatforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix
index a8badf647c0..e89a2cbece6 100644
--- a/pkgs/development/interpreters/lua-5/5.2.nix
+++ b/pkgs/development/interpreters/lua-5/5.2.nix
@@ -1,4 +1,10 @@
-{ stdenv, fetchurl, readline, compat ? false }:
+{ stdenv, fetchurl, readline
+# compiles compatibility layer with lua5.1
+, compat ? false
+, callPackage
+, self
+, packageOverrides ? (self: super: {})
+}:
 
 let
   dsoPatch = fetchurl {
@@ -6,12 +12,17 @@ let
     sha256 = "1by1dy4ql61f5c6njq9ibf9kaqm3y633g2q8j54iyjr4cxvqwqz9";
     name = "lua-arch.patch";
   };
+  luaPackages = callPackage ../../lua-modules {lua=self; overrides=packageOverrides;};
 in
 stdenv.mkDerivation rec {
   name = "lua-${version}";
   luaversion = "5.2";
   version = "${luaversion}.4";
 
+  LuaPathSearchPaths    = luaPackages.getLuaPathList luaversion;
+  LuaCPathSearchPaths   = luaPackages.getLuaCPathList luaversion;
+  setupHook = luaPackages.lua-setup-hook LuaPathSearchPaths LuaCPathSearchPaths;
+
   src = fetchurl {
     url = "https://www.lua.org/ftp/${name}.tar.gz";
     sha256 = "0jwznq0l8qg9wh5grwg07b5cy3lzngvl5m2nl1ikp6vqssmf9qmr";
@@ -21,6 +32,19 @@ stdenv.mkDerivation rec {
 
   patches = if stdenv.isDarwin then [ ./5.2.darwin.patch ] else [ dsoPatch ];
 
+
+  passthru = rec {
+    buildEnv = callPackage ./wrapper.nix {
+      lua = self;
+      inherit (luaPackages) requiredLuaModules;
+    };
+    withPackages = import ./with-packages.nix { inherit buildEnv luaPackages;};
+    pkgs = luaPackages;
+    interpreter = "${self}/bin/lua";
+  };
+
+  enableParallelBuilding = true;
+
   configurePhase =
     if stdenv.isDarwin
     then ''
diff --git a/pkgs/development/interpreters/lua-5/5.3.nix b/pkgs/development/interpreters/lua-5/5.3.nix
index eb34391e199..c1fdc0fd990 100644
--- a/pkgs/development/interpreters/lua-5/5.3.nix
+++ b/pkgs/development/interpreters/lua-5/5.3.nix
@@ -1,5 +1,11 @@
-{ stdenv, fetchurl, readline, compat ? false }:
-
+{ stdenv, fetchurl, readline, compat ? false
+, callPackage
+, self
+, packageOverrides ? (self: super: {})
+}:
+let
+  luaPackages = callPackage ../../lua-modules {lua=self; overrides=packageOverrides;};
+in
 stdenv.mkDerivation rec {
   name = "lua-${version}";
   luaversion = "5.3";
@@ -10,6 +16,10 @@ stdenv.mkDerivation rec {
     sha256 = "0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac";
   };
 
+  LuaPathSearchPaths    = luaPackages.getLuaPathList luaversion;
+  LuaCPathSearchPaths   = luaPackages.getLuaCPathList luaversion;
+  setupHook = luaPackages.lua-setup-hook LuaPathSearchPaths LuaCPathSearchPaths;
+
   buildInputs = [ readline ];
 
   patches = if stdenv.isDarwin then [ ./5.2.darwin.patch ] else [];
@@ -54,6 +64,16 @@ stdenv.mkDerivation rec {
     ln -s "$out/lib/pkgconfig/lua.pc" "$out/lib/pkgconfig/lua${luaversion}.pc"
   '';
 
+  passthru = rec {
+    buildEnv = callPackage ./wrapper.nix {
+      lua = self;
+      inherit (luaPackages) requiredLuaModules;
+    };
+    withPackages = import ./with-packages.nix { inherit buildEnv luaPackages;};
+    pkgs = luaPackages;
+    interpreter = "${self}/bin/lua";
+  };
+
   meta = {
     homepage = http://www.lua.org;
     description = "Powerful, fast, lightweight, embeddable scripting language";
diff --git a/pkgs/development/interpreters/lua-5/build-rocks.nix b/pkgs/development/interpreters/lua-5/build-rocks.nix
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/pkgs/development/interpreters/lua-5/build-rocks.nix
diff --git a/pkgs/development/interpreters/lua-5/build-rockspec.nix b/pkgs/development/interpreters/lua-5/build-rockspec.nix
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/pkgs/development/interpreters/lua-5/build-rockspec.nix
diff --git a/pkgs/development/interpreters/lua-5/setup-hook.nix b/pkgs/development/interpreters/lua-5/setup-hook.nix
new file mode 100644
index 00000000000..62caffd8d8a
--- /dev/null
+++ b/pkgs/development/interpreters/lua-5/setup-hook.nix
@@ -0,0 +1,15 @@
+{ runCommand, lib, }:
+
+LuaPathSearchPaths: LuaCPathSearchPaths:
+
+let
+  hook = ./setup-hook.sh;
+in runCommand "lua-setup-hook.sh" {
+  # hum doesn't seem to like caps !! BUG ?
+  luapathsearchpaths=lib.escapeShellArgs LuaPathSearchPaths;
+  luacpathsearchpaths=lib.escapeShellArgs LuaCPathSearchPaths;
+} ''
+  cp ${hook} hook.sh
+  substituteAllInPlace hook.sh
+  mv hook.sh $out
+''
diff --git a/pkgs/development/interpreters/lua-5/setup-hook.sh b/pkgs/development/interpreters/lua-5/setup-hook.sh
new file mode 100644
index 00000000000..5e37bd27f61
--- /dev/null
+++ b/pkgs/development/interpreters/lua-5/setup-hook.sh
@@ -0,0 +1,47 @@
+# set -e
+
+nix_print() {
+    if (( "${NIX_DEBUG:-0}" >= $1 )); then
+        echo "$2"
+    fi
+}
+
+nix_debug() {
+    nix_print 3 "$1"
+}
+
+addToLuaSearchPathWithCustomDelimiter() {
+    local varName="$1"
+    local absPattern="$2"
+    # delete longest match starting from the lua placeholder '?'
+    local topDir="${absPattern%%\?*}"
+
+    # export only if the folder exists else LUA_PATH grows too big
+    if  [ ! -d "$topDir" ]; then return; fi
+
+    export "${varName}=${!varName:+${!varName};}${absPattern}"
+}
+
+addToLuaPath() {
+    local dir="$1"
+
+    if [[ ! -d "$dir" ]]; then
+        nix_debug "$dir not a directory abort"
+        return 0
+    fi
+    cd "$dir"
+    for pattern in @luapathsearchpaths@;
+    do
+        addToLuaSearchPathWithCustomDelimiter LUA_PATH "$PWD/$pattern"
+    done
+
+    # LUA_CPATH
+    for pattern in @luacpathsearchpaths@;
+    do
+        addToLuaSearchPathWithCustomDelimiter LUA_CPATH "$PWD/$pattern"
+    done
+    cd - >/dev/null
+}
+
+addEnvHooks "$hostOffset" addToLuaPath
+
diff --git a/pkgs/development/interpreters/lua-5/with-packages.nix b/pkgs/development/interpreters/lua-5/with-packages.nix
new file mode 100644
index 00000000000..0e0fbd39735
--- /dev/null
+++ b/pkgs/development/interpreters/lua-5/with-packages.nix
@@ -0,0 +1,4 @@
+{ buildEnv, luaPackages }:
+
+# this is a function that returns a function that returns an environment
+f: let packages = f luaPackages; in buildEnv.override { extraLibs = packages; }
diff --git a/pkgs/development/interpreters/lua-5/wrapper.nix b/pkgs/development/interpreters/lua-5/wrapper.nix
new file mode 100644
index 00000000000..9abbd77d575
--- /dev/null
+++ b/pkgs/development/interpreters/lua-5/wrapper.nix
@@ -0,0 +1,73 @@
+{ stdenv, lua, buildEnv, makeWrapper
+, extraLibs ? []
+, extraOutputsToInstall ? []
+, postBuild ? ""
+, ignoreCollisions ? false
+, lib
+, requiredLuaModules
+, makeWrapperArgs ? []
+}:
+
+# Create a lua executable that knows about additional packages.
+let
+  env = let
+    paths =  requiredLuaModules (extraLibs ++ [ lua ] );
+  in buildEnv {
+    name = "${lua.name}-env";
+
+    inherit paths;
+    inherit ignoreCollisions;
+    extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall;
+
+    # we create wrapper for the binaries in the different packages
+    postBuild = ''
+
+      . "${makeWrapper}/nix-support/setup-hook"
+
+      # get access to lua functions
+      . ${lua}/nix-support/setup-hook
+
+      if [ -L "$out/bin" ]; then
+          unlink "$out/bin"
+      fi
+      mkdir -p "$out/bin"
+
+      addToLuaPath "$out"
+
+      # take every binary from lua packages and put them into the env
+      for path in ${stdenv.lib.concatStringsSep " " paths}; do
+        nix_debug "looking for binaries in path = $path"
+        if [ -d "$path/bin" ]; then
+          cd "$path/bin"
+          for prg in *; do
+            if [ -f "$prg" ]; then
+              rm -f "$out/bin/$prg"
+              if [ -x "$prg" ]; then
+                nix_debug "Making wrapper $prg"
+                makeWrapper "$path/bin/$prg" "$out/bin/$prg" --suffix LUA_PATH ';' "$LUA_PATH"   --suffix LUA_CPATH ';' "$LUA_CPATH" ${stdenv.lib.concatStringsSep " " makeWrapperArgs}
+              fi
+            fi
+          done
+        fi
+      done
+    '' + postBuild;
+
+    inherit (lua) meta;
+
+    passthru = lua.passthru // {
+      interpreter = "${env}/bin/lua";
+      inherit lua;
+      env = stdenv.mkDerivation {
+        name = "interactive-${lua.name}-environment";
+        nativeBuildInputs = [ env ];
+
+        buildCommand = ''
+          echo >&2 ""
+          echo >&2 "*** lua 'env' attributes are intended for interactive nix-shell sessions, not for building! ***"
+          echo >&2 ""
+          exit 1
+        '';
+    };
+    };
+  };
+in env
diff --git a/pkgs/development/interpreters/luajit/2.0.nix b/pkgs/development/interpreters/luajit/2.0.nix
new file mode 100644
index 00000000000..0889b7fefe6
--- /dev/null
+++ b/pkgs/development/interpreters/luajit/2.0.nix
@@ -0,0 +1,10 @@
+{ self, callPackage, lib }:
+callPackage ./default.nix {
+  inherit self;
+  version = "2.0.5";
+  isStable = true;
+  sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7";
+  extraMeta = {
+    platforms = lib.filter (p: p != "aarch64-linux") lib.meta.platforms;
+  };
+}
diff --git a/pkgs/development/interpreters/luajit/2.1.nix b/pkgs/development/interpreters/luajit/2.1.nix
new file mode 100644
index 00000000000..0f223963132
--- /dev/null
+++ b/pkgs/development/interpreters/luajit/2.1.nix
@@ -0,0 +1,7 @@
+{ self, callPackage, lib }:
+callPackage ./default.nix {
+  inherit self;
+  version = "2.1.0-beta3";
+  isStable = false;
+  sha256 = "1hyrhpkwjqsv54hnnx4cl8vk44h9d6c9w0fz1jfjz00w255y7lhs";
+}
diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix
index 9ee628f498e..c95b9e8b8e3 100644
--- a/pkgs/development/interpreters/luajit/default.nix
+++ b/pkgs/development/interpreters/luajit/default.nix
@@ -1,71 +1,74 @@
-{ stdenv, lib, fetchurl }:
-rec {
+{ stdenv, lib, fetchurl
+, name ? "luajit-${version}"
+, isStable
+, sha256
+, version
+, extraMeta ? {}
+, callPackage
+, self
+, packageOverrides ? (self: super: {})
+}:
+let
+  luaPackages = callPackage ../../lua-modules {lua=self; overrides=packageOverrides;};
+in
+stdenv.mkDerivation rec {
+  inherit name version;
+  src = fetchurl {
+    url = "http://luajit.org/download/LuaJIT-${version}.tar.gz";
+    inherit sha256;
+  };
 
-  luajit = luajit_2_1;
+  luaversion = "5.1";
 
-  luajit_2_0 = generic {
-    version = "2.0.5";
-    isStable = true;
-    sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7";
-    meta = genericMeta // {
-      platforms = lib.filter (p: p != "aarch64-linux") genericMeta.platforms;
-    };
-  };
+  patchPhase = ''
+    substituteInPlace Makefile \
+      --replace /usr/local "$out"
+
+    substituteInPlace src/Makefile --replace gcc cc
+  '' + stdenv.lib.optionalString (stdenv.cc.libc != null)
+  ''
+    substituteInPlace Makefile \
+      --replace ldconfig ${stdenv.cc.libc.bin or stdenv.cc.libc}/bin/ldconfig
+  '';
+
+  configurePhase = false;
 
-  luajit_2_1 = generic {
-    version = "2.1.0-beta3";
-    isStable = false;
-    sha256 = "1hyrhpkwjqsv54hnnx4cl8vk44h9d6c9w0fz1jfjz00w255y7lhs";
+  buildFlags = [ "amalg" ]; # Build highly optimized version
+  enableParallelBuilding = true;
+
+  installPhase   = ''
+      make install PREFIX="$out"
+      ( cd "$out/include"; ln -s luajit-*/* . )
+      ln -s "$out"/bin/luajit-* "$out"/bin/lua
+    ''
+    + stdenv.lib.optionalString (!isStable) ''
+      ln -s "$out"/bin/luajit-* "$out"/bin/luajit
+    '';
+
+  LuaPathSearchPaths = [
+    "lib/lua/${luaversion}/?.lua" "share/lua/${luaversion}/?.lua"
+    "share/lua/${luaversion}/?/init.lua" "lib/lua/${luaversion}/?/init.lua"
+    "share/${name}/?.lua"
+  ];
+  LuaCPathSearchPaths = [ "lib/lua/${luaversion}/?.so" "share/lua/${luaversion}/?.so" ];
+  setupHook = luaPackages.lua-setup-hook LuaPathSearchPaths LuaCPathSearchPaths;
+
+  passthru = rec {
+    buildEnv = callPackage ../lua-5/wrapper.nix {
+      lua = self;
+      inherit (luaPackages) requiredLuaModules;
+    };
+    withPackages = import ../lua-5/with-packages.nix { inherit buildEnv luaPackages;};
+    pkgs = luaPackages;
+    interpreter = "${self}/bin/lua";
   };
 
-  genericMeta = with stdenv.lib; {
+  meta = with stdenv.lib; extraMeta // {
     description = "High-performance JIT compiler for Lua 5.1";
     homepage    = http://luajit.org;
     license     = licenses.mit;
     platforms   = platforms.linux ++ platforms.darwin;
     maintainers = with maintainers; [ thoughtpolice smironov vcunat andir ];
   };
-
-  generic =
-    { version, sha256 ? null, isStable
-    , name ? "luajit-${version}"
-    , src ?
-      (fetchurl {
-        url = "http://luajit.org/download/LuaJIT-${version}.tar.gz";
-        inherit sha256;
-      })
-    , meta ? genericMeta
-    }:
-
-    stdenv.mkDerivation rec {
-      inherit name version src meta;
-
-      luaversion = "5.1";
-
-      patchPhase = ''
-        substituteInPlace Makefile \
-          --replace /usr/local "$out"
-
-        substituteInPlace src/Makefile --replace gcc cc
-      '' + stdenv.lib.optionalString (stdenv.cc.libc != null)
-      ''
-        substituteInPlace Makefile \
-          --replace ldconfig ${stdenv.cc.libc.bin or stdenv.cc.libc}/bin/ldconfig
-      '';
-
-      configurePhase = false;
-
-      buildFlags = [ "amalg" ]; # Build highly optimized version
-      enableParallelBuilding = true;
-
-      installPhase   = ''
-        make install PREFIX="$out"
-        ( cd "$out/include"; ln -s luajit-*/* . )
-        ln -s "$out"/bin/luajit-* "$out"/bin/lua
-      ''
-        + stdenv.lib.optionalString (!isStable)
-          ''
-            ln -s "$out"/bin/luajit-* "$out"/bin/luajit
-          '';
-    };
 }
+
diff --git a/pkgs/development/interpreters/metamath/default.nix b/pkgs/development/interpreters/metamath/default.nix
index fedb9f59f80..e8e23cee830 100644
--- a/pkgs/development/interpreters/metamath/default.nix
+++ b/pkgs/development/interpreters/metamath/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "metamath-${version}";
-  version = "0.171";
+  version = "0.172";
 
   buildInputs = [ autoreconfHook ];
 
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Taneb";
     repo = "metamath";
-    rev = "1c622a844fbdee43f13a629c73d8b33ff7fc4e44";
-    sha256 = "0bkz75saddlwinyqwmxx89nilaar401j63kgqfqiak8iw2nk3wln";
+    rev = "43141cd17638f8efb409dc5d46e7de6a6c39ec42";
+    sha256 = "07c7df0zl0wsb0pvdgkwikpr8kz7fi3mshxzk61vkamyp68djjb5";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix
index 928a5517324..d1f2edce936 100644
--- a/pkgs/development/interpreters/pixie/default.nix
+++ b/pkgs/development/interpreters/pixie/default.nix
@@ -35,7 +35,7 @@ let
     nativeBuildInputs = [ makeWrapper pkgconfig ];
     buildInputs = libs;
     PYTHON = if buildWithPypy
-      then "${pypy}/pypy-c/.pypy-c-wrapped"
+      then "${pypy}/pypy-c/pypy-c"
       else "${python2.interpreter}";
     unpackPhase = ''
       cp -R ${pixie-src} pixie-src
diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index efe14da5834..b834de7356f 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -41,7 +41,7 @@ in
 
 stdenv.mkDerivation rec {
   name = "racket-${version}";
-  version = "7.1"; # always change at once with ./minimal.nix
+  version = "7.2"; # always change at once with ./minimal.nix
 
   src = (stdenv.lib.makeOverridable ({ name, sha256 }:
     fetchurl rec {
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     }
   )) {
     inherit name;
-    sha256 = "180z0z6srzyipi9wfnbh61nbvzxr5d1cls7wxapv6fw92y52jwz9";
+    sha256 = "12cq0kiigmf9bxb4rcgxdhwc2fcdwvlyb1q3f8x4hswcpgq1ybg4";
   };
 
   FONTCONFIG_FILE = fontsConf;
diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix
index 114023defcd..c7e2056b7ca 100644
--- a/pkgs/development/interpreters/racket/minimal.nix
+++ b/pkgs/development/interpreters/racket/minimal.nix
@@ -5,7 +5,7 @@ racket.overrideAttrs (oldAttrs: rec {
   name = "racket-minimal-${oldAttrs.version}";
   src = oldAttrs.src.override {
     inherit name;
-    sha256 = "11vcqxdgyarv89ijd46wzrdl2wk7xjirg7ynlz7r0smdcqrcl711";
+    sha256 = "01wsiyqfiiwn2n4xxk8d8di92l2ng7yhc4bfmgrvkgaqzy3zfhhx";
   };
 
   meta = oldAttrs.meta // {
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 7365cd52273..2a2392011d1 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -223,10 +223,10 @@ in {
   };
 
   ruby_2_6 = generic {
-    version = rubyVersion "2" "6" "0" "";
+    version = rubyVersion "2" "6" "1" "";
     sha256 = {
-      src = "0wn0gxlx6xhhqrm2caxp0h6cj4nw7knnv5gh27qqzj0i9a95phzk";
-      git = "0bwbl4hz18dd5aij2l4s6xy90dc17d03kk577gdl34l9mbd9m7mn";
+      src = "1f0w37jz2ryvlx260rw3s3wl0wg7dkzphb54lpvrqg90pfvly0hp";
+      git = "07gp7df1izw9rdbp9ciw4q5kq8icx3zd5w1xrhwsw0dfbsmmnsrj";
     };
   };
 }
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
index 8afc64edb3f..fae76c70612 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -16,6 +16,6 @@ rec {
     "${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch"
   ];
-  "2.6.0" = ops useRailsExpress [ # no Rails Express patchset yet (2018-12-26)
+  "2.6.1" = ops useRailsExpress [ # no Rails Express patchset yet (2019-01-30)
   ];
 }
diff --git a/pkgs/development/libraries/ffmpeg/0.10.nix b/pkgs/development/libraries/ffmpeg/0.10.nix
deleted file mode 100644
index 4eebad6b307..00000000000
--- a/pkgs/development/libraries/ffmpeg/0.10.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ callPackage, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "${branch}.16";
-  branch = "0.10";
-  sha256 = "1l9z5yfp1vq4z2y4mh91707dhcn41c3pd505i0gvdzcdsp5j6y77";
-  patches = [ ./vpxenc-0.10-libvpx-1.5.patch ];
-})
diff --git a/pkgs/development/libraries/ffmpeg/1.2.nix b/pkgs/development/libraries/ffmpeg/1.2.nix
deleted file mode 100644
index 312eb70fdf2..00000000000
--- a/pkgs/development/libraries/ffmpeg/1.2.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ callPackage, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "${branch}.12";
-  branch = "1.2";
-  sha256 = "0za9w87rk4x6wkjc6iaxqx2ihlsgj181ilfgxfjc54mdgxfcjfli";
-  patches = [ ./vpxenc-1.2-libvpx-1.5.patch ];
-})
diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix
index 616394c6a08..5c70df02cdc 100644
--- a/pkgs/development/libraries/freetds/default.nix
+++ b/pkgs/development/libraries/freetds/default.nix
@@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null;
 
 stdenv.mkDerivation rec {
   name = "freetds-${version}";
-  version = "1.00.110";
+  version = "1.00.111";
 
   src = fetchurl {
     url    = "http://www.freetds.org/files/stable/${name}.tar.bz2";
-    sha256 = "1zxgvc9ikw34fsbkn9by7hwqz0p6m3f178zmj2s0qqpi84qq1vw2";
+    sha256 = "17vn95bjiib3ia3h64b7akcmgmj6wfjx7w538iylhf9whqvssi4j";
   };
 
   buildInputs = [
diff --git a/pkgs/development/libraries/getdns/default.nix b/pkgs/development/libraries/getdns/default.nix
index 002c9bc0748..0493071ee22 100644
--- a/pkgs/development/libraries/getdns/default.nix
+++ b/pkgs/development/libraries/getdns/default.nix
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
   pname = "getdns";
   name = "${pname}-${version}";
-  version = "1.5.0";
+  version = "1.5.1";
 
   src = fetchurl {
-    url = "https://getdnsapi.net/releases/${pname}-1-5-0/${pname}-${version}.tar.gz";
-    sha256 = "577182c3ace919ee70cee5629505581a10dc530bd53fe5c241603ea91c84fa84";
+    url = "https://getdnsapi.net/releases/${pname}-1-5-1/${pname}-${version}.tar.gz";
+    sha256 = "5686e61100599c309ce03535f9899a5a3d94a82cc08d10718e2cd73ad3dc28af";
   };
 
   nativeBuildInputs = [ libtool m4 autoreconfHook automake file ];
diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix
index eeeff731a6e..d532e906a51 100644
--- a/pkgs/development/libraries/gloox/default.nix
+++ b/pkgs/development/libraries/gloox/default.nix
@@ -11,14 +11,14 @@ assert idnSupport -> libidn != null;
 with stdenv.lib;
 
 let
-  version = "1.0.21";
+  version = "1.0.22";
 in
 stdenv.mkDerivation rec {
   name = "gloox-${version}";
 
   src = fetchurl {
     url = "https://camaya.net/download/gloox-${version}.tar.bz2";
-    sha256 = "1k57qgif1yii515m6jaqaibkdysfab6394bpawd2l67321f1a4rw";
+    sha256 = "0r69gq8if9yy1amjzl7qrq9lzhhna7qgz905ln4wvkwchha1ppja";
   };
 
   buildInputs = [ ]
diff --git a/pkgs/development/libraries/gnome-menus/default.nix b/pkgs/development/libraries/gnome-menus/default.nix
index 8249ac5ce3a..171c6d40fac 100644
--- a/pkgs/development/libraries/gnome-menus/default.nix
+++ b/pkgs/development/libraries/gnome-menus/default.nix
@@ -1,18 +1,21 @@
-{ stdenv, fetchurl, intltool, pkgconfig, glib, gobject-introspection }:
+{ stdenv, fetchurl, pkgconfig, glib, gobject-introspection }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-menus";
-  version = "3.31.3";
+  version = "3.31.4";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "11i5m0w15by1k8d94xla54nr4r8nnb63wk6iq0dzki4cv5d55qgw";
+    sha256 = "1iihxcibjg22jxsw3s1cxzcq0rhn1rdmx4xg7qjqij981afs8dr7";
   };
 
-  makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
+  makeFlags = [
+    "INTROSPECTION_GIRDIR=${placeholder ''out''}/share/gir-1.0/"
+    "INTROSPECTION_TYPELIBDIR=${placeholder ''out''}/lib/girepository-1.0"
+  ];
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ intltool glib gobject-introspection ];
+  buildInputs = [ glib gobject-introspection ];
 
   meta = {
     homepage = https://www.gnome.org;
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix
deleted file mode 100644
index 9c9243a1c68..00000000000
--- a/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gst-plugins-base, bzip2, yasm, orc
-, useInternalFfmpeg ? false, ffmpeg ? null }:
-
-stdenv.mkDerivation rec {
-  name = "gst-ffmpeg-0.10.13";
-
-  src = fetchurl {
-    urls = [
-      "https://gstreamer.freedesktop.org/src/gst-ffmpeg/${name}.tar.bz2"
-      "mirror://gentoo/distfiles/${name}.tar.bz2"
-      ];
-    sha256 = "0qmvgwcfybci78sd73mhvm4bsb7l0xsk9yljrgik80g011ds1z3n";
-  };
-
-  # Upstream strongly recommends against using --with-system-ffmpeg,
-  # but we do it anyway because we're so hardcore (and we don't want
-  # multiple copies of ffmpeg).
-  configureFlags = stdenv.lib.optional (!useInternalFfmpeg) "--with-system-ffmpeg";
-
-  buildInputs =
-    [ pkgconfig bzip2 gst-plugins-base orc ]
-    ++ (if useInternalFfmpeg then [ yasm ] else [ ffmpeg ]);
-
-  meta = {
-    homepage = https://gstreamer.freedesktop.org/releases/gst-ffmpeg;
-    description = "GStreamer's plug-in using FFmpeg";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.unix;
-  };
-}
diff --git a/pkgs/development/libraries/gtk+/2.0-darwin-x11.patch b/pkgs/development/libraries/gtk+/2.0-darwin-x11.patch
new file mode 100644
index 00000000000..9725cfb8426
--- /dev/null
+++ b/pkgs/development/libraries/gtk+/2.0-darwin-x11.patch
@@ -0,0 +1,22 @@
+--- a/gdk/x11/gdkapplaunchcontext-x11.c
++++ b/gdk/x11/gdkapplaunchcontext-x11.c
+@@ -26,7 +26,6 @@
+ #include <unistd.h>
+ 
+ #include <glib.h>
+-#include <gio/gdesktopappinfo.h>
+ 
+ #include "gdkx.h"
+ #include "gdkapplaunchcontext.h"
+@@ -363,10 +362,7 @@
+   else
+     workspace_str = NULL;
+ 
+-  if (G_IS_DESKTOP_APP_INFO (info))
+-    application_id = g_desktop_app_info_get_filename (G_DESKTOP_APP_INFO (info));
+-  else
+-    application_id = NULL;
++  application_id = NULL;
+ 
+   startup_id = g_strdup_printf ("%s-%lu-%s-%s-%d_TIME%lu",
+                                 g_get_prgname (),
diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix
index 266abe16c10..c7638ea5fe5 100644
--- a/pkgs/development/libraries/gtk+/2.x.nix
+++ b/pkgs/development/libraries/gtk+/2.x.nix
@@ -32,10 +32,13 @@ stdenv.mkDerivation rec {
   patches = [
     ./2.0-immodules.cache.patch
     ./gtk2-theme-paths.patch
-  ] ++ optional stdenv.isDarwin (fetchpatch {
-    url = https://bug557780.bugzilla-attachments.gnome.org/attachment.cgi?id=306776;
-    sha256 = "0sp8f1r5c4j2nlnbqgv7s7nxa4cfwigvm033hvhb1ld652pjag4r";
-  });
+  ] ++ optionals stdenv.isDarwin [
+    (fetchpatch {
+      url = https://bug557780.bugzilla-attachments.gnome.org/attachment.cgi?id=306776;
+      sha256 = "0sp8f1r5c4j2nlnbqgv7s7nxa4cfwigvm033hvhb1ld652pjag4r";
+    })
+    ./2.0-darwin-x11.patch
+  ];
 
   propagatedBuildInputs = with xorg;
     [ glib cairo pango gdk_pixbuf atk ]
diff --git a/pkgs/development/libraries/gtk+/3.0-darwin-x11.patch b/pkgs/development/libraries/gtk+/3.0-darwin-x11.patch
new file mode 100644
index 00000000000..86631634b5b
--- /dev/null
+++ b/pkgs/development/libraries/gtk+/3.0-darwin-x11.patch
@@ -0,0 +1,28 @@
+--- a/gdk/x11/gdkapplaunchcontext-x11.c
++++ b/gdk/x11/gdkapplaunchcontext-x11.c
+@@ -27,7 +27,9 @@
+ #include "gdkprivate-x11.h"
+ 
+ #include <glib.h>
++#if defined(HAVE_GIO_UNIX) && !defined(__APPLE__)
+ #include <gio/gdesktopappinfo.h>
++#endif
+ 
+ #include <string.h>
+ #include <unistd.h>
+@@ -352,10 +354,15 @@
+   else
+     workspace_str = NULL;
+ 
++#if defined(HAVE_GIO_UNIX) && !defined(__APPLE__)
+   if (G_IS_DESKTOP_APP_INFO (info))
+     application_id = g_desktop_app_info_get_filename (G_DESKTOP_APP_INFO (info));
+   else
+     application_id = NULL;
++#else
++  application_id = NULL;
++#warning Please add support for creating AppInfo from id for your OS
++#endif
+ 
+   startup_id = g_strdup_printf ("%s-%lu-%s-%s-%d_TIME%lu",
+                                 g_get_prgname (),
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index 3b194fef852..bb0c21f7739 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -35,6 +35,11 @@ stdenv.mkDerivation rec {
       url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123";
       sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p";
     })
+  ] ++ optionals stdenv.isDarwin [
+    # X11 module requires <gio/gdesktopappinfo.h> which is not installed on Darwin
+    # let’s drop that dependency in similar way to how other parts of the library do it
+    # e.g. https://gitlab.gnome.org/GNOME/gtk/blob/3.24.4/gtk/gtk-launch.c#L31-33
+    ./3.0-darwin-x11.patch
   ];
 
   buildInputs = [ libxkbcommon epoxy json-glib isocodes ]
diff --git a/pkgs/development/libraries/libamqpcpp/default.nix b/pkgs/development/libraries/libamqpcpp/default.nix
index 85972e67e10..cc6c9464de3 100644
--- a/pkgs/development/libraries/libamqpcpp/default.nix
+++ b/pkgs/development/libraries/libamqpcpp/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libamqpcpp-${version}";
-  version = "3.0.0";
+  version = "4.1.3";
 
   src = fetchFromGitHub {
     owner = "CopernicaMarketingSoftware";
     repo = "AMQP-CPP";
     rev = "v${version}";
-    sha256 = "0n93wy2v2hx9zalpyn8zxsxihh0xpgcd472qwvwsc253y97v8ngv";
+    sha256 = "0qk431ra7vcklc67fdaddrj5a7j50znjr79zrwvhkcfy82fd56zw";
   };
 
   buildInputs = [ openssl ];
diff --git a/pkgs/development/libraries/libnetfilter_acct/default.nix b/pkgs/development/libraries/libnetfilter_acct/default.nix
new file mode 100644
index 00000000000..95533696ddf
--- /dev/null
+++ b/pkgs/development/libraries/libnetfilter_acct/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pkgconfig, libmnl }:
+
+stdenv.mkDerivation rec {
+  version = "1.0.3";
+  name = "libnetfilter_acct-${version}";
+
+  src = fetchurl {
+    url = "https://www.netfilter.org/projects/libnetfilter_acct/files/${name}.tar.bz2";
+    sha256 = "06lsjndgfjsgfjr43px2n2wk3nr7whz6r405mks3887y7vpwwl22";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libmnl ];
+
+  meta = with stdenv.lib; {
+    homepage = http://www.netfilter.org/projects/libnetfilter_acct/;
+    description = "Userspace library providing interface to extended accounting infrastructure.";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/librime/default.nix b/pkgs/development/libraries/librime/default.nix
index a592fd86257..b1e42617253 100644
--- a/pkgs/development/libraries/librime/default.nix
+++ b/pkgs/development/libraries/librime/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "librime-${version}";
-  version = "1.3.2";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "rime";
     repo = "librime";
     rev = "${version}";
-    sha256 = "06q10cv7a3i6d8l3sq79nasw3p1njvmjgh4jq2hqw9abcx351m1r";
+    sha256 = "1zkx1wfbd94v55gfycyd2b94jxclfyk2zl7yw35pyjx63qdlb6sd";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index f8b993d202a..57eab750695 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -5,7 +5,7 @@ let
     url = http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz;
     sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw";
   };
-  version = "3.41";
+  version = "3.42";
   underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
 
 in stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${name}.tar.gz";
-    sha256 = "0bbif42fzz5gk451sv3yphdrl7m4p6zgk5jk0307j06xs3sihbmb";
+    sha256 = "04rg0yar0plbx1sajrzywprqyhlskczkqxxsgxmcc0qqy64y8g2x";
   };
 
   buildInputs = [ perl zlib sqlite ]
diff --git a/pkgs/development/libraries/openssl/1.1/use-etc-ssl-certs-darwin.patch b/pkgs/development/libraries/openssl/1.1/use-etc-ssl-certs-darwin.patch
new file mode 100644
index 00000000000..2c98ccfa7ed
--- /dev/null
+++ b/pkgs/development/libraries/openssl/1.1/use-etc-ssl-certs-darwin.patch
@@ -0,0 +1,13 @@
+diff --git a/include/internal/cryptlib.h b/include/internal/cryptlib.h
+index 329ef62..9a8df64 100644
+--- a/include/internal/cryptlib.h
++++ b/include/internal/cryptlib.h
+@@ -56,7 +56,7 @@ DEFINE_LHASH_OF(MEM);
+ # ifndef OPENSSL_SYS_VMS
+ #  define X509_CERT_AREA          OPENSSLDIR
+ #  define X509_CERT_DIR           OPENSSLDIR "/certs"
+-#  define X509_CERT_FILE          OPENSSLDIR "/cert.pem"
++#  define X509_CERT_FILE          "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt"
+ #  define X509_PRIVATE_DIR        OPENSSLDIR "/private"
+ #  define CTLOG_FILE              OPENSSLDIR "/ct_log_list.cnf"
+ # else
diff --git a/pkgs/development/libraries/openssl/1.1/use-etc-ssl-certs.patch b/pkgs/development/libraries/openssl/1.1/use-etc-ssl-certs.patch
new file mode 100644
index 00000000000..67d199681f9
--- /dev/null
+++ b/pkgs/development/libraries/openssl/1.1/use-etc-ssl-certs.patch
@@ -0,0 +1,13 @@
+diff --git a/include/internal/cryptlib.h b/include/internal/cryptlib.h
+index 329ef62..9a8df64 100644
+--- a/include/internal/cryptlib.h
++++ b/include/internal/cryptlib.h
+@@ -56,7 +56,7 @@ DEFINE_LHASH_OF(MEM);
+ # ifndef OPENSSL_SYS_VMS
+ #  define X509_CERT_AREA          OPENSSLDIR
+ #  define X509_CERT_DIR           OPENSSLDIR "/certs"
+-#  define X509_CERT_FILE          OPENSSLDIR "/cert.pem"
++#  define X509_CERT_FILE          "/etc/ssl/certs/ca-certificates.crt"
+ #  define X509_PRIVATE_DIR        OPENSSLDIR "/private"
+ #  define CTLOG_FILE              OPENSSLDIR "/ct_log_list.cnf"
+ # else
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 32fd6e727f7..0954e1b70bb 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -134,7 +134,13 @@ in {
   openssl_1_1 = common {
     version = "1.1.1a";
     sha256 = "0hcz7znzznbibpy3iyyhvlqrq44y88plxwdj32wjzgbwic7i687w";
-    patches = [ ./1.1/nix-ssl-cert-file.patch ];
+    patches = [
+      ./1.1/nix-ssl-cert-file.patch
+
+      (if stdenv.hostPlatform.isDarwin
+       then ./1.1/use-etc-ssl-certs-darwin.patch
+       else ./1.1/use-etc-ssl-certs.patch)
+    ];
     withDocs = true;
   };
 
diff --git a/pkgs/development/libraries/openzwave/default.nix b/pkgs/development/libraries/openzwave/default.nix
index 4150f0f466c..5a5e8ffaef7 100644
--- a/pkgs/development/libraries/openzwave/default.nix
+++ b/pkgs/development/libraries/openzwave/default.nix
@@ -3,7 +3,7 @@
 , systemd }:
 
 let
-  version = "2018-11-04";
+  version = "2018-11-13";
 
 in stdenv.mkDerivation rec {
   name = "openzwave-${version}";
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "home-assistant";
     repo = "open-zwave";
-    rev = "2cc174ad5c935d2d17828634aca2db5a60c59237";
+    rev = "0679daef6aa5a39e2441a68f7b45cfe022c4d961";
     sha256 = "1d13maj93i6h792cbvqpx43ffss44dxmvbwj2777vzvvjib8m4n8";
   };
 
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index eee9a813c74..f1b6c002488 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -33,8 +33,10 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ninja pkgconfig ];
 
-  # Not sure when and how to pass it.  It seems an upstream bug anyway.
-  CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++14";
+  # Workaround #54606
+  preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
+    sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt
+  '';
 
   cmakeFlags = [
     (mkFlag true "UNSTABLE_API_ABI_HEADERS") # previously "XPDF_HEADERS"
diff --git a/pkgs/development/libraries/qt-5/5.11/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix
index 5fbab32acda..c6cc393624e 100644
--- a/pkgs/development/libraries/qt-5/5.11/default.nix
+++ b/pkgs/development/libraries/qt-5/5.11/default.nix
@@ -61,6 +61,9 @@ let
     qtscript = [ ./qtscript.patch ];
     qtserialport = [ ./qtserialport.patch ];
     qttools = [ ./qttools.patch ];
+    qtwebengine =
+         optional stdenv.cc.isClang ./qtwebengine-clang-fix.patch
+      ++ optional stdenv.isDarwin ./qtwebengine-darwin-sdk-10.10.patch;
     qtwebkit = [ ./qtwebkit.patch ];
   };
 
diff --git a/pkgs/development/libraries/qt-5/5.11/qtwebengine-clang-fix.patch b/pkgs/development/libraries/qt-5/5.11/qtwebengine-clang-fix.patch
new file mode 100644
index 00000000000..8dafd65cd34
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.11/qtwebengine-clang-fix.patch
@@ -0,0 +1,30 @@
+Fix a following build error:
+
+In file included from ../../3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm:7:
+../../3rdparty/chromium/base/bind.h:59:3: error: static_assert failed "Bound argument |i| of type |Arg| cannot be forwarded as |Unwrapped| to the bound functor, which declares it as |Param|."
+  static_assert(
+  ^
+../../3rdparty/chromium/base/bind.h:91:7: note: in instantiation of template class 'base::internal::AssertConstructible<1, long, long, const long &, NSError *>' requested here
+    : AssertConstructible<Ns, Args, std::decay_t<Args>, Unwrapped, Params>... {
+      ^
+../../3rdparty/chromium/base/bind.h:213:27: note: in instantiation of template class 'base::internal::AssertBindArgsValidity<std::__1::integer_sequence<unsigned long, 0, 1>, base::internal::TypeList<base::WeakPtr<device::BluetoothRemoteGattCharacteristicMac>, long>, base::internal::TypeList<device::BluetoothRemoteGattCharacteristicMac *, const long &>, base::internal::TypeList<device::BluetoothRemoteGattCharacteristicMac *, NSError *> >' requested here
+  static_assert(internal::AssertBindArgsValidity<
+                          ^
+../../3rdparty/chromium/base/bind.h:242:16: note: in instantiation of function template specialization 'base::BindRepeating<void (device::BluetoothRemoteGattCharacteristicMac::*)(NSError *), base::WeakPtr<device::BluetoothRemoteGattCharacteristicMac>, long>' requested here
+  return base::BindRepeating(std::forward<Functor>(functor),
+               ^
+../../3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm:211:15: note: in instantiation of function template specialization 'base::Bind<void (device::BluetoothRemoteGattCharacteristicMac::*)(NSError *), base::WeakPtr<device::BluetoothRemoteGattCharacteristicMac>, long>' requested here
+        base::Bind(&BluetoothRemoteGattCharacteristicMac::DidWriteValue,
+              ^
+
+--- a/src/3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm
++++ b/src/3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm
+@@ -209,7 +209,7 @@ void BluetoothRemoteGattCharacteristicMac::WriteRemoteCharacteristic(
+     base::ThreadTaskRunnerHandle::Get()->PostTask(
+         FROM_HERE,
+         base::Bind(&BluetoothRemoteGattCharacteristicMac::DidWriteValue,
+-                   weak_ptr_factory_.GetWeakPtr(), nil));
++                   weak_ptr_factory_.GetWeakPtr(), nullptr));
+   }
+ }
+ 
diff --git a/pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-sdk-10.10.patch b/pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-sdk-10.10.patch
new file mode 100644
index 00000000000..d43b09b9538
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-sdk-10.10.patch
@@ -0,0 +1,160 @@
+Fix build against 10.10 SDK
+
+The SecKey part perhaps could be fixed by implementing a revert to
+https://chromium.googlesource.com/chromium/src.git/+/8418e098b9cbedf884878b61dcd3292c515845cf%5E%21/#F0
+
+--- a/src/3rdparty/chromium/content/browser/renderer_host/input/web_input_event_builders_mac.mm
++++ b/src/3rdparty/chromium/content/browser/renderer_host/input/web_input_event_builders_mac.mm
+@@ -1,3 +1,4 @@
++#define NSEventTypeScrollWheel 22
+ // Copyright 2015 The Chromium Authors. All rights reserved.
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+--- a/src/3rdparty/chromium/net/ssl/ssl_platform_key_mac.cc
++++ b/src/3rdparty/chromium/net/ssl/ssl_platform_key_mac.cc
+@@ -48,21 +48,6 @@ namespace net {
+ 
+ namespace {
+ 
+-// TODO(davidben): Remove this when we switch to building to the 10.13
+-// SDK. https://crbug.com/780980
+-#if !defined(MAC_OS_X_VERSION_10_13) || \
+-    MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_13
+-API_AVAILABLE(macosx(10.13))
+-const SecKeyAlgorithm kSecKeyAlgorithmRSASignatureDigestPSSSHA256 =
+-    CFSTR("algid:sign:RSA:digest-PSS:SHA256:SHA256:32");
+-API_AVAILABLE(macosx(10.13))
+-const SecKeyAlgorithm kSecKeyAlgorithmRSASignatureDigestPSSSHA384 =
+-    CFSTR("algid:sign:RSA:digest-PSS:SHA384:SHA384:48");
+-API_AVAILABLE(macosx(10.13))
+-const SecKeyAlgorithm kSecKeyAlgorithmRSASignatureDigestPSSSHA512 =
+-    CFSTR("algid:sign:RSA:digest-PSS:SHA512:SHA512:64");
+-#endif
+-
+ class ScopedCSSM_CC_HANDLE {
+  public:
+   ScopedCSSM_CC_HANDLE() : handle_(0) {}
+@@ -187,109 +172,6 @@ class SSLPlatformKeyCSSM : public ThreadedSSLPrivateKey::Delegate {
+   DISALLOW_COPY_AND_ASSIGN(SSLPlatformKeyCSSM);
+ };
+ 
+-// Returns the corresponding SecKeyAlgorithm or nullptr if unrecognized.
+-API_AVAILABLE(macosx(10.12))
+-SecKeyAlgorithm GetSecKeyAlgorithm(uint16_t algorithm) {
+-  switch (algorithm) {
+-    case SSL_SIGN_RSA_PKCS1_SHA512:
+-      return kSecKeyAlgorithmRSASignatureDigestPKCS1v15SHA512;
+-    case SSL_SIGN_RSA_PKCS1_SHA384:
+-      return kSecKeyAlgorithmRSASignatureDigestPKCS1v15SHA384;
+-    case SSL_SIGN_RSA_PKCS1_SHA256:
+-      return kSecKeyAlgorithmRSASignatureDigestPKCS1v15SHA256;
+-    case SSL_SIGN_RSA_PKCS1_SHA1:
+-      return kSecKeyAlgorithmRSASignatureDigestPKCS1v15SHA1;
+-    case SSL_SIGN_RSA_PKCS1_MD5_SHA1:
+-      return kSecKeyAlgorithmRSASignatureDigestPKCS1v15Raw;
+-    case SSL_SIGN_ECDSA_SECP521R1_SHA512:
+-      return kSecKeyAlgorithmECDSASignatureDigestX962SHA512;
+-    case SSL_SIGN_ECDSA_SECP384R1_SHA384:
+-      return kSecKeyAlgorithmECDSASignatureDigestX962SHA384;
+-    case SSL_SIGN_ECDSA_SECP256R1_SHA256:
+-      return kSecKeyAlgorithmECDSASignatureDigestX962SHA256;
+-    case SSL_SIGN_ECDSA_SHA1:
+-      return kSecKeyAlgorithmECDSASignatureDigestX962SHA1;
+-  }
+-
+-  if (base::mac::IsAtLeastOS10_13()) {
+-    switch (algorithm) {
+-      case SSL_SIGN_RSA_PSS_SHA512:
+-        return kSecKeyAlgorithmRSASignatureDigestPSSSHA512;
+-      case SSL_SIGN_RSA_PSS_SHA384:
+-        return kSecKeyAlgorithmRSASignatureDigestPSSSHA384;
+-      case SSL_SIGN_RSA_PSS_SHA256:
+-        return kSecKeyAlgorithmRSASignatureDigestPSSSHA256;
+-    }
+-  }
+-
+-  return nullptr;
+-}
+-
+-class API_AVAILABLE(macosx(10.12)) SSLPlatformKeySecKey
+-    : public ThreadedSSLPrivateKey::Delegate {
+- public:
+-  SSLPlatformKeySecKey(int type, size_t max_length, SecKeyRef key)
+-      : key_(key, base::scoped_policy::RETAIN) {
+-    // Determine the algorithms supported by the key.
+-    for (uint16_t algorithm : SSLPrivateKey::DefaultAlgorithmPreferences(
+-             type, true /* include PSS */)) {
+-      SecKeyAlgorithm sec_algorithm = GetSecKeyAlgorithm(algorithm);
+-      if (sec_algorithm &&
+-          SecKeyIsAlgorithmSupported(key_.get(), kSecKeyOperationTypeSign,
+-                                     sec_algorithm)) {
+-        preferences_.push_back(algorithm);
+-      }
+-    }
+-  }
+-
+-  ~SSLPlatformKeySecKey() override {}
+-
+-  std::vector<uint16_t> GetAlgorithmPreferences() override {
+-    return preferences_;
+-  }
+-
+-  Error Sign(uint16_t algorithm,
+-             base::span<const uint8_t> input,
+-             std::vector<uint8_t>* signature) override {
+-    SecKeyAlgorithm sec_algorithm = GetSecKeyAlgorithm(algorithm);
+-    if (!sec_algorithm) {
+-      NOTREACHED();
+-      return ERR_FAILED;
+-    }
+-
+-    const EVP_MD* md = SSL_get_signature_algorithm_digest(algorithm);
+-    uint8_t digest[EVP_MAX_MD_SIZE];
+-    unsigned digest_len;
+-    if (!md || !EVP_Digest(input.data(), input.size(), digest, &digest_len, md,
+-                           nullptr)) {
+-      return ERR_SSL_CLIENT_AUTH_SIGNATURE_FAILED;
+-    }
+-
+-    base::ScopedCFTypeRef<CFDataRef> digest_ref(CFDataCreateWithBytesNoCopy(
+-        kCFAllocatorDefault, digest, base::checked_cast<CFIndex>(digest_len),
+-        kCFAllocatorNull));
+-
+-    base::ScopedCFTypeRef<CFErrorRef> error;
+-    base::ScopedCFTypeRef<CFDataRef> signature_ref(SecKeyCreateSignature(
+-        key_, sec_algorithm, digest_ref, error.InitializeInto()));
+-    if (!signature_ref) {
+-      LOG(ERROR) << error;
+-      return ERR_SSL_CLIENT_AUTH_SIGNATURE_FAILED;
+-    }
+-
+-    signature->assign(
+-        CFDataGetBytePtr(signature_ref),
+-        CFDataGetBytePtr(signature_ref) + CFDataGetLength(signature_ref));
+-    return OK;
+-  }
+-
+- private:
+-  std::vector<uint16_t> preferences_;
+-  base::ScopedCFTypeRef<SecKeyRef> key_;
+-
+-  DISALLOW_COPY_AND_ASSIGN(SSLPlatformKeySecKey);
+-};
+-
+ scoped_refptr<SSLPrivateKey> CreateSSLPrivateKeyForSecKey(
+     const X509Certificate* certificate,
+     SecKeyRef private_key) {
+@@ -298,13 +180,6 @@ scoped_refptr<SSLPrivateKey> CreateSSLPrivateKeyForSecKey(
+   if (!GetClientCertInfo(certificate, &key_type, &max_length))
+     return nullptr;
+ 
+-  if (base::mac::IsAtLeastOS10_12()) {
+-    return base::MakeRefCounted<ThreadedSSLPrivateKey>(
+-        std::make_unique<SSLPlatformKeySecKey>(key_type, max_length,
+-                                               private_key),
+-        GetSSLPlatformKeyTaskRunner());
+-  }
+-
+   const CSSM_KEY* cssm_key;
+   OSStatus status = SecKeyGetCSSMKey(private_key, &cssm_key);
+   if (status != noErr) {
diff --git a/pkgs/development/libraries/qt-5/5.9/fetch.sh b/pkgs/development/libraries/qt-5/5.9/fetch.sh
index 103fa4e09ab..e631d3ae9b0 100644
--- a/pkgs/development/libraries/qt-5/5.9/fetch.sh
+++ b/pkgs/development/libraries/qt-5/5.9/fetch.sh
@@ -1,2 +1,2 @@
-WGET_ARGS=( http://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/ \
+WGET_ARGS=( http://download.qt.io/official_releases/qt/5.9/5.9.7/submodules/ \
             -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patch b/pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patch
index 1c3a9b05cb2..875fba12e2f 100644
--- a/pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patch
+++ b/pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patch
@@ -1,16 +1,3 @@
-diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
-index 66baf16..89794ef 100644
---- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
-+++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
-@@ -830,7 +830,7 @@ void QCoreTextFontEngine::getUnscaledGlyph(glyph_t glyph, QPainterPath *path, gl
- 
- QFixed QCoreTextFontEngine::emSquareSize() const
- {
--    return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont)));
-+    return QFixed(int(CTFontGetUnitsPerEm(ctfont)));
- }
- 
- QFontEngine *QCoreTextFontEngine::cloneWithSize(qreal pixelSize) const
 diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm
 index 341d3bc..3368234 100644
 --- a/src/plugins/bearer/corewlan/qcorewlanengine.mm
diff --git a/pkgs/development/libraries/qt-5/5.9/srcs.nix b/pkgs/development/libraries/qt-5/5.9/srcs.nix
index df7846ca386..09b6293daeb 100644
--- a/pkgs/development/libraries/qt-5/5.9/srcs.nix
+++ b/pkgs/development/libraries/qt-5/5.9/srcs.nix
@@ -3,275 +3,275 @@
 
 {
   qt3d = {
-    version = "5.9.3";
+    version = "5.9.7";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qt3d-opensource-src-5.9.3.tar.xz";
-      sha256 = "0gr7wvd3p8i2frj9nkfxffxapwqx6i4wh171ymvcsg2qy0r534lp";
-      name = "qt3d-opensource-src-5.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qt3d-opensource-src-5.9.7.tar.xz";
+      sha256 = "0skdp72jlfy97cw9lpa3l2ivs6f5x9w53978sf2xbkl9k1ai268l";
+      name = "qt3d-opensource-src-5.9.7.tar.xz";
     };
   };
   qtactiveqt = {
-    version = "5.9.3";
+    version = "5.9.7";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtactiveqt-opensource-src-5.9.3.tar.xz";
-      sha256 = "16aka3y7a6mhs0yfm7vbq8v5gbh2ifmk4v2hl04iacindq9f5v2r";
-      name = "qtactiveqt-opensource-src-5.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtactiveqt-opensource-src-5.9.7.tar.xz";
+      sha256 = "01yp0railyc80ldvpiy36lpsdk26rs8vfp78xca9jy1glm4cmaik";
+      name = "qtactiveqt-opensource-src-5.9.7.tar.xz";
     };
   };
   qtandroidextras = {
-    version = "5.9.3";
+    version = "5.9.7";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtandroidextras-opensource-src-5.9.3.tar.xz";
-      sha256 = "0f653qmzvr3rjjgipjbcxvp5wq9fbaz1b4bvj7g868s2d9gpqp9n";
-      name = "qtandroidextras-opensource-src-5.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtandroidextras-opensource-src-5.9.7.tar.xz";
+      sha256 = "1bl05hr0zm23z7qig3kxhzyvm440wfrjfgsxvpmlvk9pbb8h2q63";
+      name = "qtandroidextras-opensource-src-5.9.7.tar.xz";
     };
   };
   qtbase = {
-    version = "5.9.3";
+    version = "5.9.7";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtbase-opensource-src-5.9.3.tar.xz";
-      sha256 = "10lrkarvs7dpx9rlj7sjcc0pzi42098x8nqnhmydr4bnbq048z4y";
-      name = "qtbase-opensource-src-5.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtbase-opensource-src-5.9.7.tar.xz";
+      sha256 = "004gs95ig51jv2wz64kwzl4rvqqzs4rln3kqmzjs3sh6y1s9bp9n";
+      name = "qtbase-opensource-src-5.9.7.tar.xz";
     };
   };
   qtcanvas3d = {
-    version = "5.9.3";
+    version = "5.9.7";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtcanvas3d-opensource-src-5.9.3.tar.xz";
-      sha256 = "1g0a606fgal4x17ly0qrj05pb0k8riwh7nj4g3jip05g8iwb2f2y";
-      name = "qtcanvas3d-opensource-src-5.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtcanvas3d-opensource-src-5.9.7.tar.xz";
+      sha256 = "131zwqddjns7cpkdbr33jahqgvnw6f8gdcr1b2hmadi0p2shrcwq";
+      name = "qtcanvas3d-opensource-src-5.9.7.tar.xz";
     };
   };
   qtcharts = {
-    version = "5.9.3";
+    version = "5.9.7";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtcharts-opensource-src-5.9.3.tar.xz";
-      sha256 = "1sb99ncmh84bz0xzq55chgic7jk61awnfvi7ld4gq5ap3nl865zc";
-      name = "qtcharts-opensource-src-5.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtcharts-opensource-src-5.9.7.tar.xz";
+      sha256 = "1rkj4lkpgdqk4ygxivkj7gc8mlccb5sgi9mfr0xwvq5j85r3dk8n";
+      name = "qtcharts-opensource-src-5.9.7.tar.xz";
     };
   };
   qtconnectivity = {
-    version = "5.9.3";
+    version = "5.9.7";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtconnectivity-opensource-src-5.9.3.tar.xz";
-      sha256 = "0j86rspn4xgwq1ddc1mpq1kq0ib2c0ag6rsn9ly2xs4iimp1x2g2";
-      name = "qtconnectivity-opensource-src-5.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtconnectivity-opensource-src-5.9.7.tar.xz";
+      sha256 = "0f7g2lfnfgsjka7y5hdf0lbzpfxlxh8bfhdxix44cwlmwzjizy3l";
+      name = "qtconnectivity-opensource-src-5.9.7.tar.xz";
     };
   };
   qtdatavis3d = {
-    version = "5.9.3";
+    version = "5.9.7";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtdatavis3d-opensource-src-5.9.3.tar.xz";
-      sha256 = "0s636ix44akrjx47gv9qj2ac02q8clnwj3acfr28p6pagm46k7vh";
-      name = "qtdatavis3d-opensource-src-5.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtdatavis3d-opensource-src-5.9.7.tar.xz";
+      sha256 = "08anm8byxcym7h1n49j3cbxkh3kh3xjlxd3b8vi8fxyqqhvll4lv";
+      name = "qtdatavis3d-opensource-src-5.9.7.tar.xz";
     };
   };
   qtdeclarative = {
-    version = "5.9.3";
+    version = "5.9.7";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtdeclarative-opensource-src-5.9.3.tar.xz";
-      sha256 = "01wlk17zf47yzx7cc3cp617gj70yadllj2rsfk78879c0v96cpsh";
-      name = "qtdeclarative-opensource-src-5.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtdeclarative-opensource-src-5.9.7.tar.xz";
+      sha256 = "0p26c96fb33khbf7ws91ha73n72lwmn714v8spg0bla9m1jkfhk8";
+      name = "qtdeclarative-opensource-src-5.9.7.tar.xz";
     };
   };
   qtdoc = {
-    version = "5.9.3";
+    version = "5.9.7";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtdoc-opensource-src-5.9.3.tar.xz";
-      sha256 = "0aki592arm3r08y9cq8863jp9zzkvgx7sc48426n30m6q9valsg5";
-      name = "qtdoc-opensource-src-5.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtdoc-opensource-src-5.9.7.tar.xz";
+      sha256 = "1vs6dy0mdcn65fhpl8nib0pjw9bliqkjnaahqm833ayvxr15vzyj";
+      name = "qtdoc-opensource-src-5.9.7.tar.xz";
     };
   };
   qtgamepad = {
-    version = "5.9.3";
+    version = "5.9.7";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtgamepad-opensource-src-5.9.3.tar.xz";
-      sha256 = "14vari5cq10a0z02559l2m1v78g7ygnyqf1ilkmy2f0kr36wm7y6";
-      name = "qtgamepad-opensource-src-5.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtgamepad-opensource-src-5.9.7.tar.xz";
+      sha256 = "0242683h9jz6b0n11s4m4ii2691dbws0gkj45n6sx6z513blfx9f";
+      name = "qtgamepad-opensource-src-5.9.7.tar.xz";
     };
   };
   qtgraphicaleffects = {
-    version = "5.9.3";
+    version = "5.9.7";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtgraphicaleffects-opensource-src-5.9.3.tar.xz";
-      sha256 = "1nghl39sqsjamjn6pfmxmgga6z9vwzv2zbgc92amrfxxr2dh42vr";
-      name = "qtgraphicaleffects-opensource-src-5.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtgraphicaleffects-opensource-src-5.9.7.tar.xz";
+      sha256 = "1yhxa3i3jvfnc9l6a3q3pyk7y702a3pp87ypshb63607xvrxrv2d";
+      name = "qtgraphicaleffects-opensource-src-5.9.7.tar.xz";
     };
   };
   qtimageformats = {
-    version = "5.9.3";
+    version = "5.9.7";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtimageformats-opensource-src-5.9.3.tar.xz";
-      sha256 = "1p95wzm46j49c5br45g0pmlz3n3fl93j1ipzmnpmq9y2pbfhkcyl";
-      name = "qtimageformats-opensource-src-5.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtimageformats-opensource-src-5.9.7.tar.xz";
+      sha256 = "1an0k3rzxjc4x4rscnibdk36zff6g1n41lh5dasys4jc05k3w1b2";
+      name = "qtimageformats-opensource-src-5.9.7.tar.xz";
     };
   };
   qtlocation = {
-    version = "5.9.3";
+    version = "5.9.7";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtlocation-opensource-src-5.9.3.tar.xz";
-      sha256 = "1qacqz6l7zljqszblhgzg5y1v4mgki59k45ag7yc2iw7vrf45zc0";
-      name = "qtlocation-opensource-src-5.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtlocation-opensource-src-5.9.7.tar.xz";
+      sha256 = "0lp6zn630px1lj7623shq47dlv02nr0aj7iqscrk0yzhygbv7dc2";
+      name = "qtlocation-opensource-src-5.9.7.tar.xz";
     };
   };
   qtmacextras = {
-    version = "5.9.3";
+    version = "5.9.7";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtmacextras-opensource-src-5.9.3.tar.xz";
-      sha256 = "0piv3q49vhpjxafdicizcw13am49h0ybfhb37vai0x1wbrlvhdiy";
-      name = "qtmacextras-opensource-src-5.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtmacextras-opensource-src-5.9.7.tar.xz";
+      sha256 = "0b0znccbach41la226cmps9aaigpz8mj940xj890arjf8hn4jd97";
+      name = "qtmacextras-opensource-src-5.9.7.tar.xz";
     };
   };
   qtmultimedia = {
-    version = "5.9.3";
+    version = "5.9.7";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtmultimedia-opensource-src-5.9.3.tar.xz";
-      sha256 = "19iqh8xpspzlmpzh05bx5rchlslbfy2pp00xv52496yf9b95i5g7";
-      name = "qtmultimedia-opensource-src-5.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtmultimedia-opensource-src-5.9.7.tar.xz";
+      sha256 = "060gic3gl27r7k4vw4n550384b4wadqfn3biajbq6lbyj3zhgxxx";
+      name = "qtmultimedia-opensource-src-5.9.7.tar.xz";
     };
   };
   qtnetworkauth = {
-    version = "5.9.3";
+    version = "5.9.7";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtnetworkauth-opensource-src-5.9.3.tar.xz";
-      sha256 = "0fdz5q47xbiij3mi5lzhvxpq4jp9fm929v9kyvcyadz86mp3f8nz";
-      name = "qtnetworkauth-opensource-src-5.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtnetworkauth-opensource-src-5.9.7.tar.xz";
+      sha256 = "14n8wzsyq7bw67r1k442widfvszawgi5sh0b10h2jcrp5aikqr0p";
+      name = "qtnetworkauth-opensource-src-5.9.7.tar.xz";
     };
   };
   qtpurchasing = {
-    version = "5.9.3";
+    version = "5.9.7";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtpurchasing-opensource-src-5.9.3.tar.xz";
-      sha256 = "00yfdd00frgf7fs9s0vyn1c6c4abxgld5rfgkzms3y6n6lcphs0j";
-      name = "qtpurchasing-opensource-src-5.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtpurchasing-opensource-src-5.9.7.tar.xz";
+      sha256 = "1qvxsi0ar04qy0zajbhvwj5blldhfq2mn3laq15g0xxy1xh4m46i";
+      name = "qtpurchasing-opensource-src-5.9.7.tar.xz";
     };
   };
   qtquickcontrols = {
-    version = "5.9.3";
+    version = "5.9.7";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtquickcontrols-opensource-src-5.9.3.tar.xz";
-      sha256 = "09p2q3max4xrlw5svbhn11y9cgrvcjsj88xw4c0kq91cgnyyw3ih";
-      name = "qtquickcontrols-opensource-src-5.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtquickcontrols-opensource-src-5.9.7.tar.xz";
+      sha256 = "1jkz2b2wzxzmskvwwb4afqxz0yp0siaf3yhj2i01y865sp6q1wz0";
+      name = "qtquickcontrols-opensource-src-5.9.7.tar.xz";
     };
   };
   qtquickcontrols2 = {
-    version = "5.9.3";
+    version = "5.9.7";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtquickcontrols2-opensource-src-5.9.3.tar.xz";
-      sha256 = "0hq888qq8q7dglpyzif64pplqjxfrqjpkvbcx0ycq35darls5ai1";
-      name = "qtquickcontrols2-opensource-src-5.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtquickcontrols2-opensource-src-5.9.7.tar.xz";
+      sha256 = "0w9rq77a8vc9avhbwbx7swg7zw7jn21wd7si59822rw9ln1p6zb0";
+      name = "qtquickcontrols2-opensource-src-5.9.7.tar.xz";
     };
   };
   qtremoteobjects = {
-    version = "5.9.3";
+    version = "5.9.7";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtremoteobjects-opensource-src-5.9.3.tar.xz";
-      sha256 = "0z6qd381r6a7gdrsknlkkbhq9mmdqi040kfrvgm6mfa69336f4dk";
-      name = "qtremoteobjects-opensource-src-5.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtremoteobjects-opensource-src-5.9.7.tar.xz";
+      sha256 = "1ninscf4jkframv585zzi76fml1lyz0mhb091r2r54lrf66wl3lw";
+      name = "qtremoteobjects-opensource-src-5.9.7.tar.xz";
     };
   };
   qtscript = {
-    version = "5.9.3";
+    version = "5.9.7";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtscript-opensource-src-5.9.3.tar.xz";
-      sha256 = "0rjm6nph1nssfpknp4i682bvk7363y4a2f74060vcm7ib2pzl2xq";
-      name = "qtscript-opensource-src-5.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtscript-opensource-src-5.9.7.tar.xz";
+      sha256 = "0mv33a1mjaahq7ixfasvjasc881bprfbkjhx8pn3z5f0l8213m67";
+      name = "qtscript-opensource-src-5.9.7.tar.xz";
     };
   };
   qtscxml = {
-    version = "5.9.3";
+    version = "5.9.7";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtscxml-opensource-src-5.9.3.tar.xz";
-      sha256 = "06x8hs3p7bfgnl6b2fjld4s41acw1rbnxbcgkprgw2fxxnl1zxfq";
-      name = "qtscxml-opensource-src-5.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtscxml-opensource-src-5.9.7.tar.xz";
+      sha256 = "0xz2q2bl1n43gxx00nrzyc0bsnq4wch0k2rkj3prc9gsgmpq0bih";
+      name = "qtscxml-opensource-src-5.9.7.tar.xz";
     };
   };
   qtsensors = {
-    version = "5.9.3";
+    version = "5.9.7";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtsensors-opensource-src-5.9.3.tar.xz";
-      sha256 = "1hfsih5iy4fi6mnpw2shf1lzx9hxcdc1arspad1mark17l5s4pmr";
-      name = "qtsensors-opensource-src-5.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtsensors-opensource-src-5.9.7.tar.xz";
+      sha256 = "0pfh4lr9zxsh9winzx1lmcgl2hgp9lr45smcvslr4an93z6mbf8r";
+      name = "qtsensors-opensource-src-5.9.7.tar.xz";
     };
   };
   qtserialbus = {
-    version = "5.9.3";
+    version = "5.9.7";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtserialbus-opensource-src-5.9.3.tar.xz";
-      sha256 = "0f39qh05mp54frpn5sy9k5vfw5zb2gg72qaqz81mwlck2xg78qpg";
-      name = "qtserialbus-opensource-src-5.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtserialbus-opensource-src-5.9.7.tar.xz";
+      sha256 = "0n6z56axm0gbrxmnwbz8fv40ar9mw1rlfvmpqvpg5xb9031qil1b";
+      name = "qtserialbus-opensource-src-5.9.7.tar.xz";
     };
   };
   qtserialport = {
-    version = "5.9.3";
+    version = "5.9.7";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtserialport-opensource-src-5.9.3.tar.xz";
-      sha256 = "1pxb679cx77vk39ik7j0k91a57wqa63d4g4riw3r2gpcay8kxpac";
-      name = "qtserialport-opensource-src-5.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtserialport-opensource-src-5.9.7.tar.xz";
+      sha256 = "05qy4m1p5j5bh6af7d97iblsmgy9kppm5wif3bl63p6yghn319sh";
+      name = "qtserialport-opensource-src-5.9.7.tar.xz";
     };
   };
   qtspeech = {
-    version = "5.9.3";
+    version = "5.9.7";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtspeech-opensource-src-5.9.3.tar.xz";
-      sha256 = "1c4rpf3by620fx8lrvmc38r60cikqczqh2rfcm7ixz3x8cj60lh1";
-      name = "qtspeech-opensource-src-5.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtspeech-opensource-src-5.9.7.tar.xz";
+      sha256 = "0nnbqnh18vw26vphancs38vjr816xha8m6wl389kjqi01kjrcz70";
+      name = "qtspeech-opensource-src-5.9.7.tar.xz";
     };
   };
   qtsvg = {
-    version = "5.9.3";
+    version = "5.9.7";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtsvg-opensource-src-5.9.3.tar.xz";
-      sha256 = "1wjx9ymk2h19l9kk76jh87bnhhj955f9a93akvwwzfwg1jk2hrnz";
-      name = "qtsvg-opensource-src-5.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtsvg-opensource-src-5.9.7.tar.xz";
+      sha256 = "0r2mqy6lb2ypmilf83zyp73v5d9ars314jfm6f0fv5if8yw253v2";
+      name = "qtsvg-opensource-src-5.9.7.tar.xz";
     };
   };
   qttools = {
-    version = "5.9.3";
+    version = "5.9.7";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz";
-      sha256 = "1zw4j8ymwcpn7dx1dlbxpmx5lfp26rag7pysap1xry9m7vg3hb24";
-      name = "qttools-opensource-src-5.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qttools-opensource-src-5.9.7.tar.xz";
+      sha256 = "18b7jg25434p80yr929nfihk0i124bxpd2dv9mqdcicnv5q0ybnn";
+      name = "qttools-opensource-src-5.9.7.tar.xz";
     };
   };
   qttranslations = {
-    version = "5.9.3";
+    version = "5.9.7";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qttranslations-opensource-src-5.9.3.tar.xz";
-      sha256 = "1ncvj1qlcgrm0zqdlq2bkb0hc8dyisz8m7bszxyx4kyxg7n5gb20";
-      name = "qttranslations-opensource-src-5.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qttranslations-opensource-src-5.9.7.tar.xz";
+      sha256 = "051a3igp1qnd7d7bg2dvjaqwh6f67fvkn19jdfjzrdis7kcsfvdk";
+      name = "qttranslations-opensource-src-5.9.7.tar.xz";
     };
   };
   qtvirtualkeyboard = {
-    version = "5.9.3";
+    version = "5.9.7";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtvirtualkeyboard-opensource-src-5.9.3.tar.xz";
-      sha256 = "1zrj4pjy98dskzycjswbkm4m2j6k1j4150h0w7vdrw1681s3ycdr";
-      name = "qtvirtualkeyboard-opensource-src-5.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtvirtualkeyboard-opensource-src-5.9.7.tar.xz";
+      sha256 = "1qcj6ncg53rv4pg4ijdq7vbkzgzfr9bn40aif7g4dndykj0zwla7";
+      name = "qtvirtualkeyboard-opensource-src-5.9.7.tar.xz";
     };
   };
   qtwayland = {
-    version = "5.9.3";
+    version = "5.9.7";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwayland-opensource-src-5.9.3.tar.xz";
-      sha256 = "0vazcmpqdka3llmyg7m99lw0ngrydmw74p9nd04544xdn128r3ih";
-      name = "qtwayland-opensource-src-5.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtwayland-opensource-src-5.9.7.tar.xz";
+      sha256 = "0y6ky1ipg42gq390ibgr4nns9i4j648yb7bkmx6b7lhsi7mvnp2n";
+      name = "qtwayland-opensource-src-5.9.7.tar.xz";
     };
   };
   qtwebchannel = {
-    version = "5.9.3";
+    version = "5.9.7";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwebchannel-opensource-src-5.9.3.tar.xz";
-      sha256 = "0n438mk01sh2bbqakc1m3s65qqmi75m4n4hymad8wcgijfr9a9v3";
-      name = "qtwebchannel-opensource-src-5.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtwebchannel-opensource-src-5.9.7.tar.xz";
+      sha256 = "189qkfxixddfblwkaf46yrqjp91vhmw90gpafjryqfmd2141r8qj";
+      name = "qtwebchannel-opensource-src-5.9.7.tar.xz";
     };
   };
   qtwebengine = {
-    version = "5.9.3";
+    version = "5.9.7";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwebengine-opensource-src-5.9.3.tar.xz";
-      sha256 = "0dqxawc9vfffz6ygdn5mdpl79rrqfx18jy2d1w81q9w7zm113bj5";
-      name = "qtwebengine-opensource-src-5.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtwebengine-opensource-src-5.9.7.tar.xz";
+      sha256 = "0kzpgks5h19rm7gbhr688lr5f5d9ykf062kj91q7wf6fk7qd72v2";
+      name = "qtwebengine-opensource-src-5.9.7.tar.xz";
     };
   };
   qtwebkit = {
@@ -291,43 +291,43 @@
     };
   };
   qtwebsockets = {
-    version = "5.9.3";
+    version = "5.9.7";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwebsockets-opensource-src-5.9.3.tar.xz";
-      sha256 = "1phic630ah85ajxp6iqrw9bpg0y8s88y45ygkc1wcasmbgzrs1nf";
-      name = "qtwebsockets-opensource-src-5.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtwebsockets-opensource-src-5.9.7.tar.xz";
+      sha256 = "1qqvd6qf7m2xq71mdaidwabj5c03cbbi1hwc7p95fvbnz9crz79x";
+      name = "qtwebsockets-opensource-src-5.9.7.tar.xz";
     };
   };
   qtwebview = {
-    version = "5.9.3";
+    version = "5.9.7";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwebview-opensource-src-5.9.3.tar.xz";
-      sha256 = "1i99fy86gydpfsfc4my5d9vxjywfrzbqxk66cb3yf2ac57j66mpf";
-      name = "qtwebview-opensource-src-5.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtwebview-opensource-src-5.9.7.tar.xz";
+      sha256 = "1zwqkmzik4f83hdffmw0hz90mzga34hkyz7d0skfbdp25y278r12";
+      name = "qtwebview-opensource-src-5.9.7.tar.xz";
     };
   };
   qtwinextras = {
-    version = "5.9.3";
+    version = "5.9.7";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwinextras-opensource-src-5.9.3.tar.xz";
-      sha256 = "1lj4qa51ymhpvk0bdp6xf6b3n1k39kihns5lvp6xq1w2mljn6phl";
-      name = "qtwinextras-opensource-src-5.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtwinextras-opensource-src-5.9.7.tar.xz";
+      sha256 = "1a57v7krglfdi4gizm402jn9pg7fqpcma7xk6sm68zg1siv11a6x";
+      name = "qtwinextras-opensource-src-5.9.7.tar.xz";
     };
   };
   qtx11extras = {
-    version = "5.9.3";
+    version = "5.9.7";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtx11extras-opensource-src-5.9.3.tar.xz";
-      sha256 = "1gpjgca4xvyy0r743kh2ys128r14fh6j8bdphnmmi5v2pf6bzq74";
-      name = "qtx11extras-opensource-src-5.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtx11extras-opensource-src-5.9.7.tar.xz";
+      sha256 = "02jdiw94dasnkszi5w1pysfgz8xrr71pzah37nbnqg0knn4dzich";
+      name = "qtx11extras-opensource-src-5.9.7.tar.xz";
     };
   };
   qtxmlpatterns = {
-    version = "5.9.3";
+    version = "5.9.7";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtxmlpatterns-opensource-src-5.9.3.tar.xz";
-      sha256 = "1fphhqr3v3vzjp2vbv16bc1vs879wn7aqlabgcpkhqx92ak6d76g";
-      name = "qtxmlpatterns-opensource-src-5.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtxmlpatterns-opensource-src-5.9.7.tar.xz";
+      sha256 = "0j0rxkpyww5cgcjhy0332jsyka1d811wf6zmr16d5fdkbryp7d65";
+      name = "qtxmlpatterns-opensource-src-5.9.7.tar.xz";
     };
   };
 }
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index a80488bad5e..ddb82832337 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -12,7 +12,8 @@
 , pciutils
 , systemd
 , enableProprietaryCodecs ? true
-, gn, darwin, openbsm
+, gn
+, cups, darwin, openbsm, runCommand, xcbuild
 , ffmpeg ? null
 , lib, stdenv
 }:
@@ -26,7 +27,7 @@ qtModule {
   qtInputs = [ qtdeclarative qtquickcontrols qtlocation qtwebchannel ];
   nativeBuildInputs = [
     bison coreutils flex git gperf ninja pkgconfig python2 which gn
-  ];
+  ] ++ optional stdenv.isDarwin xcbuild;
   doCheck = true;
   outputs = [ "bin" "dev" "out" ];
 
@@ -42,7 +43,7 @@ qtModule {
       ( cd src/3rdparty/chromium; patchShebangs . )
     ''
     # Patch Chromium build files
-    + optionalString (builtins.compareVersions qtCompatVersion "5.12" < 0) ''
+    + optionalString (lib.versionOlder qtCompatVersion "5.12") ''
       substituteInPlace ./src/3rdparty/chromium/build/common.gypi --replace /bin/echo ${coreutils}/bin/echo
       substituteInPlace ./src/3rdparty/chromium/v8/${if qt56 then "build" else "gypfiles"}/toolchain.gypi \
         --replace /bin/echo ${coreutils}/bin/echo
@@ -65,33 +66,46 @@ qtModule {
       sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
         src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc
     ''
-    + optionalString stdenv.isDarwin ''
+    + optionalString stdenv.isDarwin (''
       # Remove annoying xcode check
       substituteInPlace mkspecs/features/platform.prf \
-        --replace "lessThan(QMAKE_XCODE_VERSION, 7.3)" false
+        --replace "lessThan(QMAKE_XCODE_VERSION, 7.3)" false \
+        --replace "/usr/bin/xcodebuild" "xcodebuild"
+
+      substituteInPlace src/3rdparty/chromium/build/mac_toolchain.py \
+        --replace "/usr/bin/xcode-select" "xcode-select"
+
       substituteInPlace src/core/config/mac_osx.pri \
         --replace /usr ${stdenv.cc} \
         --replace "isEmpty(QMAKE_MAC_SDK_VERSION)" false
 
-    # FIXME Needed with old Apple SDKs
-    # Abandon all hope ye who try to make sense of this.
+    ''
+    # TODO remove when new Apple SDK is in
+    + (if lib.versionOlder qtCompatVersion "5.11" then ''
     substituteInPlace src/3rdparty/chromium/base/mac/foundation_util.mm \
       --replace "NSArray<NSString*>*" "NSArray*"
     substituteInPlace src/3rdparty/chromium/base/mac/sdk_forward_declarations.h \
       --replace "NSDictionary<VNImageOption, id>*" "NSDictionary*" \
       --replace "NSArray<VNRequest*>*" "NSArray*" \
       --replace "typedef NSString* VNImageOption NS_STRING_ENUM" "typedef NSString* VNImageOption"
+    '' else ''
+    substituteInPlace src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Classes/Common/RTCFieldTrials.mm \
+      --replace "NSDictionary<NSString *, NSString *> *" "NSDictionary*"
+    substituteInPlace src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCFieldTrials.h \
+      --replace "NSDictionary<NSString *, NSString *> *" "NSDictionary*"
+    '')
+    + ''
 
     cat <<EOF > src/3rdparty/chromium/build/mac/find_sdk.py
 #!/usr/bin/env python
+print("${darwin.apple_sdk.sdk}")
 print("10.10.0")
-print("")
 EOF
 
     cat <<EOF > src/3rdparty/chromium/build/config/mac/sdk_info.py
 #!/usr/bin/env python
-print('xcode_version="9.1"')
-print('xcode_version_int=9')
+print('xcode_version="0910"')
+print('xcode_version_int=910')
 print('xcode_build="9B55"')
 print('machine_os_build="17E199"')
 print('sdk_path=""')
@@ -100,12 +114,32 @@ print('sdk_platform_path=""')
 print('sdk_build="17B41"')
 EOF
 
+    substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/BUILD.gn \
+      --replace '$sysroot/usr' "${darwin.xnu}"
+
     # Apple has some secret stuff they don't share with OpenBSM
     substituteInPlace src/3rdparty/chromium/base/mac/mach_port_broker.mm \
       --replace "audit_token_to_pid(msg.trailer.msgh_audit)" "msg.trailer.msgh_audit.val[5]"
-    '';
 
-  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10 -DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_10";
+    substituteInPlace src/3rdparty/chromium/sandbox/mac/BUILD.gn \
+      --replace 'libs = [ "sandbox" ]' 'libs = [ "/usr/lib/libsandbox.1.dylib" ]'
+    '');
+
+  NIX_CFLAGS_COMPILE =
+    lib.optionalString stdenv.isDarwin [
+      "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10"
+      "-DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_10"
+
+      #
+      # Prevent errors like
+      # /nix/store/xxx-apple-framework-CoreData/Library/Frameworks/CoreData.framework/Headers/NSEntityDescription.h:51:7:
+      # error: pointer to non-const type 'id' with no explicit ownership
+      #     id** _kvcPropertyAccessors;
+      #
+      # TODO remove when new Apple SDK is in
+      #
+      "-fno-objc-arc"
+    ];
 
   preConfigure = ''
     export NINJAFLAGS=-j$NIX_BUILD_CORES
@@ -160,7 +194,10 @@ EOF
 
     # frameworks
     ApplicationServices
+    AVFoundation
     Foundation
+    ForceFeedback
+    GameController
     AppKit
     ImageCaptureCore
     CoreBluetooth
@@ -173,8 +210,28 @@ EOF
     libunwind
   ]);
 
+  buildInputs = optionals stdenv.isDarwin (with darwin; [
+    cups
+
+    # For sandbox.h include
+    (runCommand "MacOS_SDK_sandbox.h" {} ''
+      install -Dm444 "${lib.getDev darwin.apple_sdk.sdk}"/include/sandbox.h "$out"/include/sandbox.h
+    '')
+
+    # For:
+    # _NSDefaultRunLoopMode
+    # _OBJC_CLASS_$_NSDate
+    # _OBJC_CLASS_$_NSDictionary
+    # _OBJC_CLASS_$_NSRunLoop
+    # _OBJC_CLASS_$_NSURL
+    darwin.cf-private
+  ]);
+
+  __impureHostDeps = optional stdenv.isDarwin "/usr/lib/libsandbox.1.dylib";
+
   dontUseNinjaBuild = true;
   dontUseNinjaInstall = true;
+  dontUseXcbuild = true;
 
   postInstall = lib.optionalString stdenv.isLinux ''
     cat > $out/libexec/qt.conf <<EOF
diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix
index 2b3c88d5886..2e5371e285b 100644
--- a/pkgs/development/libraries/qtkeychain/default.nix
+++ b/pkgs/development/libraries/qtkeychain/default.nix
@@ -20,13 +20,7 @@ stdenv.mkDerivation rec {
 
   patches = if withQt5 then null else [ ./0001-Fixes-build-with-Qt4.patch ];
 
-  cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ]
-    ++ stdenv.lib.optional stdenv.isDarwin [
-       # correctly detect the compiler
-       # for details see cmake --help-policy CMP0025
-       "-DCMAKE_POLICY_DEFAULT_CMP0025=NEW"
-       ]
-   ;
+  cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ];
 
   nativeBuildInputs = [ cmake ];
 
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index 3d516fb5d9d..55fc3f750df 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -4,6 +4,9 @@
 # (for compatibility with reference BLAS).
 , blas64 ? null
 , buildPackages
+# Select a specific optimization target (other than the default)
+# See https://github.com/xianyi/OpenBLAS/blob/develop/TargetList.txt
+, target ? null
 }:
 
 with stdenv.lib;
@@ -11,39 +14,41 @@ with stdenv.lib;
 let blas64_ = blas64; in
 
 let
+  setTarget = x: if target == null then x else target;
+
   # To add support for a new platform, add an element to this set.
   configs = {
     armv6l-linux = {
       BINARY = 32;
-      TARGET = "ARMV6";
+      TARGET = setTarget "ARMV6";
       DYNAMIC_ARCH = false;
       USE_OPENMP = true;
     };
 
     armv7l-linux = {
       BINARY = 32;
-      TARGET = "ARMV7";
+      TARGET = setTarget "ARMV7";
       DYNAMIC_ARCH = false;
       USE_OPENMP = true;
     };
 
     aarch64-linux = {
       BINARY = 64;
-      TARGET = "ARMV8";
+      TARGET = setTarget "ARMV8";
       DYNAMIC_ARCH = true;
       USE_OPENMP = true;
     };
 
     i686-linux = {
       BINARY = 32;
-      TARGET = "P2";
+      TARGET = setTarget "P2";
       DYNAMIC_ARCH = true;
       USE_OPENMP = true;
     };
 
     x86_64-darwin = {
       BINARY = 64;
-      TARGET = "ATHLON";
+      TARGET = setTarget "ATHLON";
       DYNAMIC_ARCH = true;
       USE_OPENMP = false;
       MACOSX_DEPLOYMENT_TARGET = "10.7";
@@ -51,7 +56,7 @@ let
 
     x86_64-linux = {
       BINARY = 64;
-      TARGET = "ATHLON";
+      TARGET = setTarget "ATHLON";
       DYNAMIC_ARCH = true;
       USE_OPENMP = true;
     };
diff --git a/pkgs/development/libraries/totem-pl-parser/default.nix b/pkgs/development/libraries/totem-pl-parser/default.nix
index 4c052a5c02f..fe84217d943 100644
--- a/pkgs/development/libraries/totem-pl-parser/default.nix
+++ b/pkgs/development/libraries/totem-pl-parser/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gmime, libxml2, gobject-introspection, gnome3 }:
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2, gobject-introspection, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "totem-pl-parser";
-  version = "3.26.1";
+  version = "3.26.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0k5pnka907invgds48d73c1xx1a366v5dcld3gr2l1dgmjwc9qka";
+    sha256 = "0fhwhrq5p0a8arh3lzk5bfjlkip3rlna9r6ybpi9fid4cpwsr1nk";
   };
 
   passthru = {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection ];
-  buildInputs = [ gmime libxml2 ];
+  buildInputs = [ libxml2 ];
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Videos;
diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index 5769ee94a1b..b0e97038b7b 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -24,8 +24,8 @@ let lispPackages = rec {
       quicklispdist = pkgs.fetchurl {
         # Will usually be replaced with a fresh version anyway, but needs to be
         # a valid distinfo.txt
-        url = "http://beta.quicklisp.org/dist/quicklisp/2018-08-31/distinfo.txt";
-        sha256 = "1im4p6vcxkp5hrim28cdf5isyw8a1v9aqsz2xfsfp3z3qd49dixd";
+        url = "https://beta.quicklisp.org/dist/quicklisp/2019-01-07/distinfo.txt";
+        sha256 = "1f0giy182p6qlmmqljir92566c8l1g2sv41cbzv86s3kv0j640fd";
       };
       buildPhase = '' true; '';
       postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
index 9b9486e9758..48dd57aac54 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''alexandria'';
-  version = ''20170830-git'';
+  version = ''20181210-git'';
 
   description = ''Alexandria is a collection of portable public domain utilities.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/alexandria/2017-08-30/alexandria-20170830-git.tgz'';
-    sha256 = ''0vprl8kg5qahwp8zyc26bk0qpdynga9hbv5qnlvk3cclfpvm8kl9'';
+    url = ''http://beta.quicklisp.org/archive/alexandria/2018-12-10/alexandria-20181210-git.tgz'';
+    sha256 = ''0dg0gr7cgrrl70sq0sbz8i1zcli54bqg4x532wscz3156xrl2588'';
   };
 
   packageName = "alexandria";
@@ -19,8 +19,8 @@ rec {
 }
 /* (SYSTEM alexandria DESCRIPTION
     Alexandria is a collection of portable public domain utilities. SHA256
-    0vprl8kg5qahwp8zyc26bk0qpdynga9hbv5qnlvk3cclfpvm8kl9 URL
-    http://beta.quicklisp.org/archive/alexandria/2017-08-30/alexandria-20170830-git.tgz
-    MD5 13ea5af7055094a87dec1e45090f894a NAME alexandria FILENAME alexandria
-    DEPS NIL DEPENDENCIES NIL VERSION 20170830-git SIBLINGS (alexandria-tests)
+    0dg0gr7cgrrl70sq0sbz8i1zcli54bqg4x532wscz3156xrl2588 URL
+    http://beta.quicklisp.org/archive/alexandria/2018-12-10/alexandria-20181210-git.tgz
+    MD5 2a7530a412cd94a56b6d4e5864fb8819 NAME alexandria FILENAME alexandria
+    DEPS NIL DEPENDENCIES NIL VERSION 20181210-git SIBLINGS (alexandria-tests)
     PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
index 9daab46784d..40d5aed4991 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''array-utils'';
-  version = ''20180831-git'';
+  version = ''20181018-git'';
 
   description = ''A few utilities for working with arrays.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/array-utils/2018-08-31/array-utils-20180831-git.tgz'';
-    sha256 = ''1m3ciz73psy3gln5f2q1c6igfmhxjjq97bqbjsvmyj2l9f6m6bl7'';
+    url = ''http://beta.quicklisp.org/archive/array-utils/2018-10-18/array-utils-20181018-git.tgz'';
+    sha256 = ''1w13zwdhms4xbsnp9p6j71a4ppzglhxm81savyq0spf3zlm2l5yn'';
   };
 
   packageName = "array-utils";
@@ -18,8 +18,8 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM array-utils DESCRIPTION A few utilities for working with arrays.
-    SHA256 1m3ciz73psy3gln5f2q1c6igfmhxjjq97bqbjsvmyj2l9f6m6bl7 URL
-    http://beta.quicklisp.org/archive/array-utils/2018-08-31/array-utils-20180831-git.tgz
-    MD5 fa07e8fac5263d4fed7acb3d53e5855a NAME array-utils FILENAME array-utils
-    DEPS NIL DEPENDENCIES NIL VERSION 20180831-git SIBLINGS (array-utils-test)
+    SHA256 1w13zwdhms4xbsnp9p6j71a4ppzglhxm81savyq0spf3zlm2l5yn URL
+    http://beta.quicklisp.org/archive/array-utils/2018-10-18/array-utils-20181018-git.tgz
+    MD5 e32cc0474cf299ad1f5666e2864aa3d8 NAME array-utils FILENAME array-utils
+    DEPS NIL DEPENDENCIES NIL VERSION 20181018-git SIBLINGS (array-utils-test)
     PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix
index ec4e31013f9..5d7f3f2dd10 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''Tool for building up an xml dom of an excel spreadsheet nicely.'';
 
-  deps = [ args."alexandria" args."babel" args."buildnode" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ];
+  deps = [ args."alexandria" args."babel" args."buildnode" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."flexi-streams" args."iterate" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz'';
@@ -31,8 +31,6 @@ rec {
      (NAME closure-common FILENAME closure-common)
      (NAME closure-html FILENAME closure-html)
      (NAME collectors FILENAME collectors) (NAME cxml FILENAME cxml)
-     (NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks)
-     (NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml)
      (NAME flexi-streams FILENAME flexi-streams)
      (NAME iterate FILENAME iterate)
      (NAME named-readtables FILENAME named-readtables)
@@ -42,9 +40,9 @@ rec {
      (NAME trivial-gray-streams FILENAME trivial-gray-streams))
     DEPENDENCIES
     (alexandria babel buildnode cl-interpol cl-ppcre cl-unicode closer-mop
-     closure-common closure-html collectors cxml cxml-dom cxml-klacks cxml-test
-     cxml-xml flexi-streams iterate named-readtables puri split-sequence swank
-     symbol-munger trivial-features trivial-gray-streams)
+     closure-common closure-html collectors cxml flexi-streams iterate
+     named-readtables puri split-sequence swank symbol-munger trivial-features
+     trivial-gray-streams)
     VERSION buildnode-20170403-git SIBLINGS
     (buildnode-excel buildnode-html5 buildnode-kml buildnode-xul buildnode)
     PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix
index 86bdb36c8d2..0a2e56a9c9b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix
@@ -7,7 +7,7 @@ rec {
 
   description = ''Tool for building up an xml dom nicely.'';
 
-  deps = [ args."alexandria" args."babel" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ];
+  deps = [ args."alexandria" args."babel" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz'';
@@ -31,8 +31,6 @@ rec {
      (NAME closure-common FILENAME closure-common)
      (NAME closure-html FILENAME closure-html)
      (NAME collectors FILENAME collectors) (NAME cxml FILENAME cxml)
-     (NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks)
-     (NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml)
      (NAME flexi-streams FILENAME flexi-streams)
      (NAME iterate FILENAME iterate) (NAME lisp-unit2 FILENAME lisp-unit2)
      (NAME named-readtables FILENAME named-readtables)
@@ -42,10 +40,9 @@ rec {
      (NAME trivial-gray-streams FILENAME trivial-gray-streams))
     DEPENDENCIES
     (alexandria babel buildnode-xhtml cl-interpol cl-ppcre cl-unicode
-     closer-mop closure-common closure-html collectors cxml cxml-dom
-     cxml-klacks cxml-test cxml-xml flexi-streams iterate lisp-unit2
-     named-readtables puri split-sequence swank symbol-munger trivial-features
-     trivial-gray-streams)
+     closer-mop closure-common closure-html collectors cxml flexi-streams
+     iterate lisp-unit2 named-readtables puri split-sequence swank
+     symbol-munger trivial-features trivial-gray-streams)
     VERSION 20170403-git SIBLINGS
     (buildnode-excel buildnode-html5 buildnode-kml buildnode-xhtml
      buildnode-xul)
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
index f3e64cb965e..6cf81070734 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''caveman'';
-  version = ''20180831-git'';
+  version = ''20181210-git'';
 
   description = ''Web Application Framework for Common Lisp'';
 
-  deps = [ args."alexandria" args."anaphora" args."babel" args."babel-streams" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-emb" args."cl-fad" args."cl-ppcre" args."cl-project" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."clack-v1-compat" args."dexador" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."map-set" args."marshal" args."md5" args."myway" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."rfc2388" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ];
+  deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-emb" args."cl-fad" args."cl-ppcre" args."cl-project" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."clack-v1-compat" args."dexador" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."map-set" args."marshal" args."md5" args."myway" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."rfc2388" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/caveman/2018-08-31/caveman-20180831-git.tgz'';
-    sha256 = ''0c4qkvmjqdkm14cgdpsqcl1h5ixb92l6l08nkd4may2kpfh2xq0s'';
+    url = ''http://beta.quicklisp.org/archive/caveman/2018-12-10/caveman-20181210-git.tgz'';
+    sha256 = ''04b5dhmdwcwpdcjk4bk25fmqx786k7g3iqsk1xc35kvsxi9ykldf'';
   };
 
   packageName = "caveman";
@@ -18,11 +18,11 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM caveman DESCRIPTION Web Application Framework for Common Lisp SHA256
-    0c4qkvmjqdkm14cgdpsqcl1h5ixb92l6l08nkd4may2kpfh2xq0s URL
-    http://beta.quicklisp.org/archive/caveman/2018-08-31/caveman-20180831-git.tgz
-    MD5 b417563f04b2619172127a6abeed786a NAME caveman FILENAME caveman DEPS
+    04b5dhmdwcwpdcjk4bk25fmqx786k7g3iqsk1xc35kvsxi9ykldf URL
+    http://beta.quicklisp.org/archive/caveman/2018-12-10/caveman-20181210-git.tgz
+    MD5 d3192b79636901bb0676681fc5d05748 NAME caveman FILENAME caveman DEPS
     ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
-     (NAME babel FILENAME babel) (NAME babel-streams FILENAME babel-streams)
+     (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
      (NAME cffi-toolchain FILENAME cffi-toolchain) (NAME chipz FILENAME chipz)
@@ -68,18 +68,18 @@ rec {
      (NAME trivial-types FILENAME trivial-types)
      (NAME usocket FILENAME usocket) (NAME xsubseq FILENAME xsubseq))
     DEPENDENCIES
-    (alexandria anaphora babel babel-streams bordeaux-threads cffi cffi-grovel
-     cffi-toolchain chipz chunga circular-streams cl+ssl cl-annot cl-ansi-text
-     cl-base64 cl-colors cl-cookie cl-emb cl-fad cl-ppcre cl-project
-     cl-reexport cl-syntax cl-syntax-annot cl-utilities clack
-     clack-handler-hunchentoot clack-socket clack-test clack-v1-compat dexador
-     do-urlencode fast-http fast-io flexi-streams http-body hunchentoot
-     ironclad jonathan lack lack-component lack-middleware-backtrace lack-util
-     let-plus local-time map-set marshal md5 myway named-readtables nibbles
-     proc-parse prove quri rfc2388 smart-buffer split-sequence static-vectors
-     trivial-backtrace trivial-features trivial-garbage trivial-gray-streams
-     trivial-mimes trivial-types usocket xsubseq)
-    VERSION 20180831-git SIBLINGS
+    (alexandria anaphora babel bordeaux-threads cffi cffi-grovel cffi-toolchain
+     chipz chunga circular-streams cl+ssl cl-annot cl-ansi-text cl-base64
+     cl-colors cl-cookie cl-emb cl-fad cl-ppcre cl-project cl-reexport
+     cl-syntax cl-syntax-annot cl-utilities clack clack-handler-hunchentoot
+     clack-socket clack-test clack-v1-compat dexador do-urlencode fast-http
+     fast-io flexi-streams http-body hunchentoot ironclad jonathan lack
+     lack-component lack-middleware-backtrace lack-util let-plus local-time
+     map-set marshal md5 myway named-readtables nibbles proc-parse prove quri
+     rfc2388 smart-buffer split-sequence static-vectors trivial-backtrace
+     trivial-features trivial-garbage trivial-gray-streams trivial-mimes
+     trivial-types usocket xsubseq)
+    VERSION 20181210-git SIBLINGS
     (caveman-middleware-dbimanager caveman-test caveman2-db caveman2-test
      caveman2)
     PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
index 07b062b5197..1af0947627f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cffi-grovel'';
-  version = ''cffi_0.19.0'';
+  version = ''cffi_0.20.0'';
 
   description = ''The CFFI Groveller'';
 
   deps = [ args."alexandria" args."babel" args."cffi" args."cffi-toolchain" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cffi/2018-02-28/cffi_0.19.0.tgz'';
-    sha256 = ''12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9'';
+    url = ''http://beta.quicklisp.org/archive/cffi/2018-12-10/cffi_0.20.0.tgz'';
+    sha256 = ''1jal7r0dqp0sc5wj8a97xjlvfvayymdp1w3172hdxfppddnhhm8z'';
   };
 
   packageName = "cffi-grovel";
@@ -18,13 +18,13 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cffi-grovel DESCRIPTION The CFFI Groveller SHA256
-    12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9 URL
-    http://beta.quicklisp.org/archive/cffi/2018-02-28/cffi_0.19.0.tgz MD5
-    7589b6437fec19fdabc65892536c3dc3 NAME cffi-grovel FILENAME cffi-grovel DEPS
+    1jal7r0dqp0sc5wj8a97xjlvfvayymdp1w3172hdxfppddnhhm8z URL
+    http://beta.quicklisp.org/archive/cffi/2018-12-10/cffi_0.20.0.tgz MD5
+    94a8b377cf1ac7d8fc73dcc98f3420c6 NAME cffi-grovel FILENAME cffi-grovel DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME cffi FILENAME cffi) (NAME cffi-toolchain FILENAME cffi-toolchain)
      (NAME trivial-features FILENAME trivial-features))
     DEPENDENCIES (alexandria babel cffi cffi-toolchain trivial-features)
-    VERSION cffi_0.19.0 SIBLINGS
+    VERSION cffi_0.20.0 SIBLINGS
     (cffi-examples cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat cffi)
     PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix
index f1d7e117655..c440c72788f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cffi-toolchain'';
-  version = ''cffi_0.19.0'';
+  version = ''cffi_0.20.0'';
 
   description = ''The CFFI toolchain'';
 
   deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cffi/2018-02-28/cffi_0.19.0.tgz'';
-    sha256 = ''12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9'';
+    url = ''http://beta.quicklisp.org/archive/cffi/2018-12-10/cffi_0.20.0.tgz'';
+    sha256 = ''1jal7r0dqp0sc5wj8a97xjlvfvayymdp1w3172hdxfppddnhhm8z'';
   };
 
   packageName = "cffi-toolchain";
@@ -18,14 +18,14 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cffi-toolchain DESCRIPTION The CFFI toolchain SHA256
-    12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9 URL
-    http://beta.quicklisp.org/archive/cffi/2018-02-28/cffi_0.19.0.tgz MD5
-    7589b6437fec19fdabc65892536c3dc3 NAME cffi-toolchain FILENAME
+    1jal7r0dqp0sc5wj8a97xjlvfvayymdp1w3172hdxfppddnhhm8z URL
+    http://beta.quicklisp.org/archive/cffi/2018-12-10/cffi_0.20.0.tgz MD5
+    94a8b377cf1ac7d8fc73dcc98f3420c6 NAME cffi-toolchain FILENAME
     cffi-toolchain DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME cffi FILENAME cffi)
      (NAME trivial-features FILENAME trivial-features))
-    DEPENDENCIES (alexandria babel cffi trivial-features) VERSION cffi_0.19.0
+    DEPENDENCIES (alexandria babel cffi trivial-features) VERSION cffi_0.20.0
     SIBLINGS
     (cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-uffi-compat cffi)
     PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
index 8568d9a3dfa..001c7d9a545 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cffi'';
-  version = ''cffi_0.19.0'';
+  version = ''cffi_0.20.0'';
 
   parasites = [ "cffi/c2ffi" "cffi/c2ffi-generator" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."alexandria" args."babel" args."cl-json" args."cl-ppcre" args."trivial-features" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cffi/2018-02-28/cffi_0.19.0.tgz'';
-    sha256 = ''12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9'';
+    url = ''http://beta.quicklisp.org/archive/cffi/2018-12-10/cffi_0.20.0.tgz'';
+    sha256 = ''1jal7r0dqp0sc5wj8a97xjlvfvayymdp1w3172hdxfppddnhhm8z'';
   };
 
   packageName = "cffi";
@@ -20,15 +20,15 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cffi DESCRIPTION The Common Foreign Function Interface SHA256
-    12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9 URL
-    http://beta.quicklisp.org/archive/cffi/2018-02-28/cffi_0.19.0.tgz MD5
-    7589b6437fec19fdabc65892536c3dc3 NAME cffi FILENAME cffi DEPS
+    1jal7r0dqp0sc5wj8a97xjlvfvayymdp1w3172hdxfppddnhhm8z URL
+    http://beta.quicklisp.org/archive/cffi/2018-12-10/cffi_0.20.0.tgz MD5
+    94a8b377cf1ac7d8fc73dcc98f3420c6 NAME cffi FILENAME cffi DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME cl-json FILENAME cl-json) (NAME cl-ppcre FILENAME cl-ppcre)
      (NAME trivial-features FILENAME trivial-features)
      (NAME uiop FILENAME uiop))
     DEPENDENCIES (alexandria babel cl-json cl-ppcre trivial-features uiop)
-    VERSION cffi_0.19.0 SIBLINGS
+    VERSION cffi_0.20.0 SIBLINGS
     (cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-toolchain
      cffi-uffi-compat)
     PARASITES (cffi/c2ffi cffi/c2ffi-generator)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
index 377c8c2209b..d678fd8e942 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-async-repl'';
-  version = ''cl-async-20180711-git'';
+  version = ''cl-async-20190107-git'';
 
   description = ''REPL integration for CL-ASYNC.'';
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-async/2018-07-11/cl-async-20180711-git.tgz'';
-    sha256 = ''1fy7qd72n1x0h44l67rwln1mxdj1hnc1xp98zc702zywxm99qabz'';
+    url = ''http://beta.quicklisp.org/archive/cl-async/2019-01-07/cl-async-20190107-git.tgz'';
+    sha256 = ''11hgsnms6w2s1vsphsqdwyqql11aa6bzplzrp5w4lizl2nkva82b'';
   };
 
   packageName = "cl-async-repl";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-async-repl DESCRIPTION REPL integration for CL-ASYNC. SHA256
-    1fy7qd72n1x0h44l67rwln1mxdj1hnc1xp98zc702zywxm99qabz URL
-    http://beta.quicklisp.org/archive/cl-async/2018-07-11/cl-async-20180711-git.tgz
-    MD5 7347a187dde464b996f9c4abd8176d2c NAME cl-async-repl FILENAME
+    11hgsnms6w2s1vsphsqdwyqql11aa6bzplzrp5w4lizl2nkva82b URL
+    http://beta.quicklisp.org/archive/cl-async/2019-01-07/cl-async-20190107-git.tgz
+    MD5 609aa604c6940ee81f382cb249f3ca72 NAME cl-async-repl FILENAME
     cl-async-repl DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -39,5 +39,5 @@ rec {
     (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-async
      cl-async-base cl-async-util cl-libuv cl-ppcre fast-io static-vectors
      trivial-features trivial-gray-streams vom)
-    VERSION cl-async-20180711-git SIBLINGS
+    VERSION cl-async-20190107-git SIBLINGS
     (cl-async-ssl cl-async-test cl-async) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
index 2129c7f83f7..722e05ed09c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-async-ssl'';
-  version = ''cl-async-20180711-git'';
+  version = ''cl-async-20190107-git'';
 
   description = ''SSL Wrapper around cl-async socket implementation.'';
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-async/2018-07-11/cl-async-20180711-git.tgz'';
-    sha256 = ''1fy7qd72n1x0h44l67rwln1mxdj1hnc1xp98zc702zywxm99qabz'';
+    url = ''http://beta.quicklisp.org/archive/cl-async/2019-01-07/cl-async-20190107-git.tgz'';
+    sha256 = ''11hgsnms6w2s1vsphsqdwyqql11aa6bzplzrp5w4lizl2nkva82b'';
   };
 
   packageName = "cl-async-ssl";
@@ -19,9 +19,9 @@ rec {
 }
 /* (SYSTEM cl-async-ssl DESCRIPTION
     SSL Wrapper around cl-async socket implementation. SHA256
-    1fy7qd72n1x0h44l67rwln1mxdj1hnc1xp98zc702zywxm99qabz URL
-    http://beta.quicklisp.org/archive/cl-async/2018-07-11/cl-async-20180711-git.tgz
-    MD5 7347a187dde464b996f9c4abd8176d2c NAME cl-async-ssl FILENAME
+    11hgsnms6w2s1vsphsqdwyqql11aa6bzplzrp5w4lizl2nkva82b URL
+    http://beta.quicklisp.org/archive/cl-async/2019-01-07/cl-async-20190107-git.tgz
+    MD5 609aa604c6940ee81f382cb249f3ca72 NAME cl-async-ssl FILENAME
     cl-async-ssl DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -40,5 +40,5 @@ rec {
     (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-async
      cl-async-base cl-async-util cl-libuv cl-ppcre fast-io static-vectors
      trivial-features trivial-gray-streams vom)
-    VERSION cl-async-20180711-git SIBLINGS
+    VERSION cl-async-20190107-git SIBLINGS
     (cl-async-repl cl-async-test cl-async) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
index e5a2a0bc7fd..edb4b01b0d1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-async'';
-  version = ''20180711-git'';
+  version = ''20190107-git'';
 
   parasites = [ "cl-async-base" "cl-async-util" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."uiop" args."vom" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-async/2018-07-11/cl-async-20180711-git.tgz'';
-    sha256 = ''1fy7qd72n1x0h44l67rwln1mxdj1hnc1xp98zc702zywxm99qabz'';
+    url = ''http://beta.quicklisp.org/archive/cl-async/2019-01-07/cl-async-20190107-git.tgz'';
+    sha256 = ''11hgsnms6w2s1vsphsqdwyqql11aa6bzplzrp5w4lizl2nkva82b'';
   };
 
   packageName = "cl-async";
@@ -20,9 +20,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-async DESCRIPTION Asynchronous operations for Common Lisp. SHA256
-    1fy7qd72n1x0h44l67rwln1mxdj1hnc1xp98zc702zywxm99qabz URL
-    http://beta.quicklisp.org/archive/cl-async/2018-07-11/cl-async-20180711-git.tgz
-    MD5 7347a187dde464b996f9c4abd8176d2c NAME cl-async FILENAME cl-async DEPS
+    11hgsnms6w2s1vsphsqdwyqql11aa6bzplzrp5w4lizl2nkva82b URL
+    http://beta.quicklisp.org/archive/cl-async/2019-01-07/cl-async-20190107-git.tgz
+    MD5 609aa604c6940ee81f382cb249f3ca72 NAME cl-async FILENAME cl-async DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
@@ -37,5 +37,5 @@ rec {
     (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-libuv
      cl-ppcre fast-io static-vectors trivial-features trivial-gray-streams uiop
      vom)
-    VERSION 20180711-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test)
+    VERSION 20190107-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test)
     PARASITES (cl-async-base cl-async-util)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
index 40c1ac7d6a9..a1da44a6b89 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-dbi'';
-  version = ''20180831-git'';
+  version = ''20190107-git'';
 
   description = '''';
 
   deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."named-readtables" args."split-sequence" args."trivial-types" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz'';
-    sha256 = ''19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9'';
+    url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz'';
+    sha256 = ''02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2'';
   };
 
   packageName = "cl-dbi";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-dbi DESCRIPTION NIL SHA256
-    19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9 URL
-    http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz
-    MD5 2fc95bff95d3cd25e3afeb003ee009d2 NAME cl-dbi FILENAME cl-dbi DEPS
+    02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2 URL
+    http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz
+    MD5 349829f5d0bf363b828827ad6728c54e NAME cl-dbi FILENAME cl-dbi DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cl-annot FILENAME cl-annot) (NAME cl-syntax FILENAME cl-syntax)
@@ -32,5 +32,5 @@ rec {
     DEPENDENCIES
     (alexandria bordeaux-threads cl-annot cl-syntax cl-syntax-annot closer-mop
      dbi named-readtables split-sequence trivial-types)
-    VERSION 20180831-git SIBLINGS
+    VERSION 20190107-git SIBLINGS
     (dbd-mysql dbd-postgres dbd-sqlite3 dbi-test dbi) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
index b5ede76f817..f37e653bc56 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
@@ -7,7 +7,7 @@ rec {
 
   description = ''Portable CL Locale Support'';
 
-  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cl-fad" args."cl-l10n-cldr" args."cl-ppcre" args."closer-mop" args."closure-common" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."hu_dot_dwim_dot_stefil" args."iterate" args."local-time" args."metabang-bind" args."parse-number" args."puri" args."trivial-features" args."trivial-gray-streams" ];
+  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cl-fad" args."cl-l10n-cldr" args."cl-ppcre" args."closer-mop" args."closure-common" args."cxml" args."flexi-streams" args."hu_dot_dwim_dot_stefil" args."iterate" args."local-time" args."metabang-bind" args."parse-number" args."puri" args."trivial-features" args."trivial-gray-streams" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-l10n/2016-12-04/cl-l10n-20161204-darcs.tgz'';
@@ -28,8 +28,6 @@ rec {
      (NAME cl-fad FILENAME cl-fad) (NAME cl-l10n-cldr FILENAME cl-l10n-cldr)
      (NAME cl-ppcre FILENAME cl-ppcre) (NAME closer-mop FILENAME closer-mop)
      (NAME closure-common FILENAME closure-common) (NAME cxml FILENAME cxml)
-     (NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks)
-     (NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml)
      (NAME flexi-streams FILENAME flexi-streams)
      (NAME hu.dwim.stefil FILENAME hu_dot_dwim_dot_stefil)
      (NAME iterate FILENAME iterate) (NAME local-time FILENAME local-time)
@@ -39,7 +37,6 @@ rec {
      (NAME trivial-gray-streams FILENAME trivial-gray-streams))
     DEPENDENCIES
     (alexandria babel bordeaux-threads cl-fad cl-l10n-cldr cl-ppcre closer-mop
-     closure-common cxml cxml-dom cxml-klacks cxml-test cxml-xml flexi-streams
-     hu.dwim.stefil iterate local-time metabang-bind parse-number puri
-     trivial-features trivial-gray-streams)
+     closure-common cxml flexi-streams hu.dwim.stefil iterate local-time
+     metabang-bind parse-number puri trivial-features trivial-gray-streams)
     VERSION 20161204-darcs SIBLINGS NIL PARASITES (cl-l10n/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
index c950fa292a8..36d15673427 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-libuv'';
-  version = ''20180831-git'';
+  version = ''20190107-git'';
 
   description = ''Low-level libuv bindings for Common Lisp.'';
 
   deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-libuv/2018-08-31/cl-libuv-20180831-git.tgz'';
-    sha256 = ''1dxay9vw0wmlmwjq5xcs622n4m7g9ivfr46z1igdrkfqvmdz411f'';
+    url = ''http://beta.quicklisp.org/archive/cl-libuv/2019-01-07/cl-libuv-20190107-git.tgz'';
+    sha256 = ''1cfr29i5j78qy7ax2fs1z4nqyz3kx9121rlpdika12n1zvnhrcm8'';
   };
 
   packageName = "cl-libuv";
@@ -18,13 +18,13 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-libuv DESCRIPTION Low-level libuv bindings for Common Lisp.
-    SHA256 1dxay9vw0wmlmwjq5xcs622n4m7g9ivfr46z1igdrkfqvmdz411f URL
-    http://beta.quicklisp.org/archive/cl-libuv/2018-08-31/cl-libuv-20180831-git.tgz
-    MD5 d755a060faac0d50a4500ae1628401ce NAME cl-libuv FILENAME cl-libuv DEPS
+    SHA256 1cfr29i5j78qy7ax2fs1z4nqyz3kx9121rlpdika12n1zvnhrcm8 URL
+    http://beta.quicklisp.org/archive/cl-libuv/2019-01-07/cl-libuv-20190107-git.tgz
+    MD5 c09c505dc45812cc773454ffc6fdbd38 NAME cl-libuv FILENAME cl-libuv DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
      (NAME cffi-toolchain FILENAME cffi-toolchain)
      (NAME trivial-features FILENAME trivial-features))
     DEPENDENCIES
     (alexandria babel cffi cffi-grovel cffi-toolchain trivial-features) VERSION
-    20180831-git SIBLINGS NIL PARASITES NIL) */
+    20190107-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
index a0443cb5af0..08b6a492e76 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-postgres'';
-  version = ''postmodern-20180831-git'';
+  version = ''postmodern-20190107-git'';
 
-  parasites = [ "cl-postgres/tests" ];
+  parasites = [ "cl-postgres/simple-date-tests" "cl-postgres/tests" ];
 
   description = ''Low-level client library for PostgreSQL'';
 
-  deps = [ args."fiveam" args."md5" args."split-sequence" args."usocket" ];
+  deps = [ args."fiveam" args."md5" args."simple-date_slash_postgres-glue" args."split-sequence" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/postmodern/2018-08-31/postmodern-20180831-git.tgz'';
-    sha256 = ''062xhy6aadzgmwpz8h0n7884yv5m4nwqmxrc75m3c60k1lmccpwx'';
+    url = ''http://beta.quicklisp.org/archive/postmodern/2019-01-07/postmodern-20190107-git.tgz'';
+    sha256 = ''030p5kp593p4z7p3k0828dlayglw2si3q187z1fafgpvspp42sd5'';
   };
 
   packageName = "cl-postgres";
@@ -20,13 +20,14 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-postgres DESCRIPTION Low-level client library for PostgreSQL
-    SHA256 062xhy6aadzgmwpz8h0n7884yv5m4nwqmxrc75m3c60k1lmccpwx URL
-    http://beta.quicklisp.org/archive/postmodern/2018-08-31/postmodern-20180831-git.tgz
-    MD5 78c3e998cff7305db5e4b4e90b9bbee6 NAME cl-postgres FILENAME cl-postgres
+    SHA256 030p5kp593p4z7p3k0828dlayglw2si3q187z1fafgpvspp42sd5 URL
+    http://beta.quicklisp.org/archive/postmodern/2019-01-07/postmodern-20190107-git.tgz
+    MD5 3f6f78c4fb0f5a8bb9f13247f1f3d6eb NAME cl-postgres FILENAME cl-postgres
     DEPS
     ((NAME fiveam FILENAME fiveam) (NAME md5 FILENAME md5)
+     (NAME simple-date/postgres-glue FILENAME simple-date_slash_postgres-glue)
      (NAME split-sequence FILENAME split-sequence)
      (NAME usocket FILENAME usocket))
-    DEPENDENCIES (fiveam md5 split-sequence usocket) VERSION
-    postmodern-20180831-git SIBLINGS (postmodern s-sql simple-date) PARASITES
-    (cl-postgres/tests)) */
+    DEPENDENCIES (fiveam md5 simple-date/postgres-glue split-sequence usocket)
+    VERSION postmodern-20190107-git SIBLINGS (postmodern s-sql simple-date)
+    PARASITES (cl-postgres/simple-date-tests cl-postgres/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix
index d2b3de9cae1..4c97f03870f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-ppcre-template'';
-  version = ''cl-unification-20171227-git'';
+  version = ''cl-unification-20190107-git'';
 
   description = ''A system used to conditionally load the CL-PPCRE Template.
 
@@ -12,8 +12,8 @@ REGULAR-EXPRESSION-TEMPLATE.'';
   deps = [ args."cl-ppcre" args."cl-unification" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-unification/2017-12-27/cl-unification-20171227-git.tgz'';
-    sha256 = ''0shwnvn5zf0iwgyqf3pa1b9cv2xghl7pss1ymrjgs95r6ijqxn2p'';
+    url = ''http://beta.quicklisp.org/archive/cl-unification/2019-01-07/cl-unification-20190107-git.tgz'';
+    sha256 = ''0mp40wh58afnpqx9i9wg5x364g35rkd6c9d5hb9g6pdxadqx0cfv'';
   };
 
   packageName = "cl-ppcre-template";
@@ -27,12 +27,12 @@ REGULAR-EXPRESSION-TEMPLATE.'';
 This system is not required and it is handled only if CL-PPCRE is
 available.  If it is, then the library provides the
 REGULAR-EXPRESSION-TEMPLATE.
-    SHA256 0shwnvn5zf0iwgyqf3pa1b9cv2xghl7pss1ymrjgs95r6ijqxn2p URL
-    http://beta.quicklisp.org/archive/cl-unification/2017-12-27/cl-unification-20171227-git.tgz
-    MD5 45bfd18f8e15d16222e0f747992a6ce6 NAME cl-ppcre-template FILENAME
+    SHA256 0mp40wh58afnpqx9i9wg5x364g35rkd6c9d5hb9g6pdxadqx0cfv URL
+    http://beta.quicklisp.org/archive/cl-unification/2019-01-07/cl-unification-20190107-git.tgz
+    MD5 a7a12789cc48e571b0871d55cef11b7f NAME cl-ppcre-template FILENAME
     cl-ppcre-template DEPS
     ((NAME cl-ppcre FILENAME cl-ppcre)
      (NAME cl-unification FILENAME cl-unification))
-    DEPENDENCIES (cl-ppcre cl-unification) VERSION cl-unification-20171227-git
+    DEPENDENCIES (cl-ppcre cl-unification) VERSION cl-unification-20190107-git
     SIBLINGS (cl-unification-lib cl-unification-test cl-unification) PARASITES
     NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
index 6d284b7b012..dbdd53a9346 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-unification'';
-  version = ''20171227-git'';
+  version = ''20190107-git'';
 
   description = ''The CL-UNIFICATION system.
 
@@ -10,8 +10,8 @@ The system contains the definitions for the 'unification' machinery.'';
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-unification/2017-12-27/cl-unification-20171227-git.tgz'';
-    sha256 = ''0shwnvn5zf0iwgyqf3pa1b9cv2xghl7pss1ymrjgs95r6ijqxn2p'';
+    url = ''http://beta.quicklisp.org/archive/cl-unification/2019-01-07/cl-unification-20190107-git.tgz'';
+    sha256 = ''0mp40wh58afnpqx9i9wg5x364g35rkd6c9d5hb9g6pdxadqx0cfv'';
   };
 
   packageName = "cl-unification";
@@ -22,8 +22,8 @@ The system contains the definitions for the 'unification' machinery.'';
 /* (SYSTEM cl-unification DESCRIPTION The CL-UNIFICATION system.
 
 The system contains the definitions for the 'unification' machinery.
-    SHA256 0shwnvn5zf0iwgyqf3pa1b9cv2xghl7pss1ymrjgs95r6ijqxn2p URL
-    http://beta.quicklisp.org/archive/cl-unification/2017-12-27/cl-unification-20171227-git.tgz
-    MD5 45bfd18f8e15d16222e0f747992a6ce6 NAME cl-unification FILENAME
-    cl-unification DEPS NIL DEPENDENCIES NIL VERSION 20171227-git SIBLINGS
+    SHA256 0mp40wh58afnpqx9i9wg5x364g35rkd6c9d5hb9g6pdxadqx0cfv URL
+    http://beta.quicklisp.org/archive/cl-unification/2019-01-07/cl-unification-20190107-git.tgz
+    MD5 a7a12789cc48e571b0871d55cef11b7f NAME cl-unification FILENAME
+    cl-unification DEPS NIL DEPENDENCIES NIL VERSION 20190107-git SIBLINGS
     (cl-unification-lib cl-unification-test cl-ppcre-template) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix
index af0e917425a..f329437a75a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl_plus_ssl'';
-  version = ''cl+ssl-20180831-git'';
+  version = ''cl+ssl-20181018-git'';
 
   parasites = [ "openssl-1.1.0" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."flexi-streams" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl+ssl/2018-08-31/cl+ssl-20180831-git.tgz'';
-    sha256 = ''1b35wz228kgcp9hc30mi38d004q2ixbv1b3krwycclnk4m65bl2r'';
+    url = ''http://beta.quicklisp.org/archive/cl+ssl/2018-10-18/cl+ssl-20181018-git.tgz'';
+    sha256 = ''1rih343mrhhmma868bk9ip7s1gqqkwlmcq63vq8vpdr2wzv47srm'';
   };
 
   packageName = "cl+ssl";
@@ -20,9 +20,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl+ssl DESCRIPTION Common Lisp interface to OpenSSL. SHA256
-    1b35wz228kgcp9hc30mi38d004q2ixbv1b3krwycclnk4m65bl2r URL
-    http://beta.quicklisp.org/archive/cl+ssl/2018-08-31/cl+ssl-20180831-git.tgz
-    MD5 56cd0b42cd9f7b8645db330ebc98600c NAME cl+ssl FILENAME cl_plus_ssl DEPS
+    1rih343mrhhmma868bk9ip7s1gqqkwlmcq63vq8vpdr2wzv47srm URL
+    http://beta.quicklisp.org/archive/cl+ssl/2018-10-18/cl+ssl-20181018-git.tgz
+    MD5 45d92813cc134bf04725ee6a1f0c24a7 NAME cl+ssl FILENAME cl_plus_ssl DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cffi FILENAME cffi) (NAME flexi-streams FILENAME flexi-streams)
@@ -33,5 +33,5 @@ rec {
     DEPENDENCIES
     (alexandria babel bordeaux-threads cffi flexi-streams trivial-features
      trivial-garbage trivial-gray-streams uiop)
-    VERSION cl+ssl-20180831-git SIBLINGS (cl+ssl.test) PARASITES
+    VERSION cl+ssl-20181018-git SIBLINGS (cl+ssl.test) PARASITES
     (openssl-1.1.0)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix
index 252f9794e76..6de9d3f8fc9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clack-handler-hunchentoot'';
-  version = ''clack-20180831-git'';
+  version = ''clack-20181018-git'';
 
   description = ''Clack handler for Hunchentoot.'';
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."clack-socket" args."flexi-streams" args."hunchentoot" args."md5" args."rfc2388" args."split-sequence" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz'';
-    sha256 = ''0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647'';
+    url = ''http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz'';
+    sha256 = ''1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf'';
   };
 
   packageName = "clack-handler-hunchentoot";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM clack-handler-hunchentoot DESCRIPTION Clack handler for Hunchentoot.
-    SHA256 0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647 URL
-    http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz
-    MD5 5042ece3b0a8b07cb4b318fbc250b4fe NAME clack-handler-hunchentoot
+    SHA256 1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf URL
+    http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz
+    MD5 16121d921667ee8d0d70324da7281849 NAME clack-handler-hunchentoot
     FILENAME clack-handler-hunchentoot DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -42,7 +42,7 @@ rec {
      cl-ppcre clack-socket flexi-streams hunchentoot md5 rfc2388 split-sequence
      trivial-backtrace trivial-features trivial-garbage trivial-gray-streams
      usocket)
-    VERSION clack-20180831-git SIBLINGS
+    VERSION clack-20181018-git SIBLINGS
     (clack-handler-fcgi clack-handler-toot clack-handler-wookie clack-socket
      clack-test clack-v1-compat clack t-clack-handler-fcgi
      t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
index d5163cabe04..745b87a6576 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clack-socket'';
-  version = ''clack-20180831-git'';
+  version = ''clack-20181018-git'';
 
   description = '''';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz'';
-    sha256 = ''0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647'';
+    url = ''http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz'';
+    sha256 = ''1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf'';
   };
 
   packageName = "clack-socket";
@@ -18,10 +18,10 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM clack-socket DESCRIPTION NIL SHA256
-    0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647 URL
-    http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz
-    MD5 5042ece3b0a8b07cb4b318fbc250b4fe NAME clack-socket FILENAME
-    clack-socket DEPS NIL DEPENDENCIES NIL VERSION clack-20180831-git SIBLINGS
+    1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf URL
+    http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz
+    MD5 16121d921667ee8d0d70324da7281849 NAME clack-socket FILENAME
+    clack-socket DEPS NIL DEPENDENCIES NIL VERSION clack-20181018-git SIBLINGS
     (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot
      clack-handler-wookie clack-test clack-v1-compat clack t-clack-handler-fcgi
      t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix
index 1d081fbef58..c1c80e48cbd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clack-test'';
-  version = ''clack-20180831-git'';
+  version = ''clack-20181018-git'';
 
   description = ''Testing Clack Applications.'';
 
   deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."dexador" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."md5" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."rfc2388" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz'';
-    sha256 = ''0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647'';
+    url = ''http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz'';
+    sha256 = ''1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf'';
   };
 
   packageName = "clack-test";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM clack-test DESCRIPTION Testing Clack Applications. SHA256
-    0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647 URL
-    http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz
-    MD5 5042ece3b0a8b07cb4b318fbc250b4fe NAME clack-test FILENAME clack-test
+    1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf URL
+    http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz
+    MD5 16121d921667ee8d0d70324da7281849 NAME clack-test FILENAME clack-test
     DEPS
     ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
      (NAME babel FILENAME babel)
@@ -71,7 +71,7 @@ rec {
      split-sequence static-vectors trivial-backtrace trivial-features
      trivial-garbage trivial-gray-streams trivial-mimes trivial-types usocket
      xsubseq)
-    VERSION clack-20180831-git SIBLINGS
+    VERSION clack-20181018-git SIBLINGS
     (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot
      clack-handler-wookie clack-socket clack-v1-compat clack
      t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
index 8b2e2c70453..5477fc5cd02 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clack-v1-compat'';
-  version = ''clack-20180831-git'';
+  version = ''clack-20181018-git'';
 
   description = '''';
 
   deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."dexador" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."marshal" args."md5" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."rfc2388" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."uiop" args."usocket" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz'';
-    sha256 = ''0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647'';
+    url = ''http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz'';
+    sha256 = ''1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf'';
   };
 
   packageName = "clack-v1-compat";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM clack-v1-compat DESCRIPTION NIL SHA256
-    0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647 URL
-    http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz
-    MD5 5042ece3b0a8b07cb4b318fbc250b4fe NAME clack-v1-compat FILENAME
+    1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf URL
+    http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz
+    MD5 16121d921667ee8d0d70324da7281849 NAME clack-v1-compat FILENAME
     clack-v1-compat DEPS
     ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
      (NAME babel FILENAME babel)
@@ -73,7 +73,7 @@ rec {
      rfc2388 smart-buffer split-sequence static-vectors trivial-backtrace
      trivial-features trivial-garbage trivial-gray-streams trivial-mimes
      trivial-types uiop usocket xsubseq)
-    VERSION clack-20180831-git SIBLINGS
+    VERSION clack-20181018-git SIBLINGS
     (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot
      clack-handler-wookie clack-socket clack-test clack t-clack-handler-fcgi
      t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
index 0b2828d06df..612e6b5c066 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clack'';
-  version = ''20180831-git'';
+  version = ''20181018-git'';
 
   description = ''Web application environment for Common Lisp'';
 
   deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."nibbles" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz'';
-    sha256 = ''0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647'';
+    url = ''http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz'';
+    sha256 = ''1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf'';
   };
 
   packageName = "clack";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM clack DESCRIPTION Web application environment for Common Lisp SHA256
-    0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647 URL
-    http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz
-    MD5 5042ece3b0a8b07cb4b318fbc250b4fe NAME clack FILENAME clack DEPS
+    1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf URL
+    http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz
+    MD5 16121d921667ee8d0d70324da7281849 NAME clack FILENAME clack DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME ironclad FILENAME ironclad) (NAME lack FILENAME lack)
@@ -31,7 +31,7 @@ rec {
     DEPENDENCIES
     (alexandria bordeaux-threads ironclad lack lack-component
      lack-middleware-backtrace lack-util nibbles uiop)
-    VERSION 20180831-git SIBLINGS
+    VERSION 20181018-git SIBLINGS
     (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot
      clack-handler-wookie clack-socket clack-test clack-v1-compat
      t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
index a13537d7e90..ce078c3196a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''closer-mop'';
-  version = ''20180831-git'';
+  version = ''20190107-git'';
 
   description = ''Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/closer-mop/2018-08-31/closer-mop-20180831-git.tgz'';
-    sha256 = ''01lzgh6rgbmfyfspiligkq44z56h2xgg55hxixnrgycbaipzgkbg'';
+    url = ''http://beta.quicklisp.org/archive/closer-mop/2019-01-07/closer-mop-20190107-git.tgz'';
+    sha256 = ''0h6fd0kr3g8dd782sxd7zrqljqfnw6pz1dsiadl0x853ki680gcw'';
   };
 
   packageName = "closer-mop";
@@ -19,7 +19,7 @@ rec {
 }
 /* (SYSTEM closer-mop DESCRIPTION
     Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.
-    SHA256 01lzgh6rgbmfyfspiligkq44z56h2xgg55hxixnrgycbaipzgkbg URL
-    http://beta.quicklisp.org/archive/closer-mop/2018-08-31/closer-mop-20180831-git.tgz
-    MD5 968426b07f9792f95fe3c9b83d68d756 NAME closer-mop FILENAME closer-mop
-    DEPS NIL DEPENDENCIES NIL VERSION 20180831-git SIBLINGS NIL PARASITES NIL) */
+    SHA256 0h6fd0kr3g8dd782sxd7zrqljqfnw6pz1dsiadl0x853ki680gcw URL
+    http://beta.quicklisp.org/archive/closer-mop/2019-01-07/closer-mop-20190107-git.tgz
+    MD5 6aa5a1e9901b579eb50e2fb46035bc50 NAME closer-mop FILENAME closer-mop
+    DEPS NIL DEPENDENCIES NIL VERSION 20190107-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
index fb808164aa2..3866dd6f459 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''closure-common'';
-  version = ''20101107-git'';
+  version = ''20181018-git'';
 
   description = '''';
 
   deps = [ args."alexandria" args."babel" args."trivial-features" args."trivial-gray-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/closure-common/2010-11-07/closure-common-20101107-git.tgz'';
-    sha256 = ''1982dpn2z7rlznn74gxy9biqybh2d4r1n688h9pn1s2bssgv3hk4'';
+    url = ''http://beta.quicklisp.org/archive/closure-common/2018-10-18/closure-common-20181018-git.tgz'';
+    sha256 = ''18bp7jnxma9hscp09fa723ws9nnynjil935rp8dy9hp6ypghpxpn'';
   };
 
   packageName = "closure-common";
@@ -18,12 +18,12 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM closure-common DESCRIPTION NIL SHA256
-    1982dpn2z7rlznn74gxy9biqybh2d4r1n688h9pn1s2bssgv3hk4 URL
-    http://beta.quicklisp.org/archive/closure-common/2010-11-07/closure-common-20101107-git.tgz
-    MD5 12c45a2f0420b2e86fa06cb6575b150a NAME closure-common FILENAME
+    18bp7jnxma9hscp09fa723ws9nnynjil935rp8dy9hp6ypghpxpn URL
+    http://beta.quicklisp.org/archive/closure-common/2018-10-18/closure-common-20181018-git.tgz
+    MD5 b09ee60c258a29f0c107960ec4c04ada NAME closure-common FILENAME
     closure-common DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME trivial-features FILENAME trivial-features)
      (NAME trivial-gray-streams FILENAME trivial-gray-streams))
     DEPENDENCIES (alexandria babel trivial-features trivial-gray-streams)
-    VERSION 20101107-git SIBLINGS NIL PARASITES NIL) */
+    VERSION 20181018-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
index 685e8128368..6f570ce5c8f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clx'';
-  version = ''20180711-git'';
+  version = ''20181210-git'';
 
   parasites = [ "clx/test" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."fiasco" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clx/2018-07-11/clx-20180711-git.tgz'';
-    sha256 = ''0vpavllapc0j6j7iwxpxzgl8n5krvrwhmd5k2k0f3pr6sgl1y29h'';
+    url = ''http://beta.quicklisp.org/archive/clx/2018-12-10/clx-20181210-git.tgz'';
+    sha256 = ''1xaylf5j1xdyqmvpw7c3hdcc44bz8ax4rz02n8hvznwvg3xcman6'';
   };
 
   packageName = "clx";
@@ -21,8 +21,8 @@ rec {
 }
 /* (SYSTEM clx DESCRIPTION
     An implementation of the X Window System protocol in Lisp. SHA256
-    0vpavllapc0j6j7iwxpxzgl8n5krvrwhmd5k2k0f3pr6sgl1y29h URL
-    http://beta.quicklisp.org/archive/clx/2018-07-11/clx-20180711-git.tgz MD5
-    27d5e904d2b7e4cdf4e8492839d15bad NAME clx FILENAME clx DEPS
-    ((NAME fiasco FILENAME fiasco)) DEPENDENCIES (fiasco) VERSION 20180711-git
+    1xaylf5j1xdyqmvpw7c3hdcc44bz8ax4rz02n8hvznwvg3xcman6 URL
+    http://beta.quicklisp.org/archive/clx/2018-12-10/clx-20181210-git.tgz MD5
+    d6d0edd1594e6bc420b1e2ba0c453636 NAME clx FILENAME clx DEPS
+    ((NAME fiasco FILENAME fiasco)) DEPENDENCIES (fiasco) VERSION 20181210-git
     SIBLINGS NIL PARASITES (clx/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix
index c83b2993968..98c565648dc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''An implementation of css selectors that interacts with cl-html5-parser's simple-tree'';
 
-  deps = [ args."alexandria" args."babel" args."buildnode" args."cl-html5-parser" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."css-selectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."named-readtables" args."puri" args."split-sequence" args."string-case" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."yacc" ];
+  deps = [ args."alexandria" args."babel" args."buildnode" args."cl-html5-parser" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."css-selectors" args."cxml" args."flexi-streams" args."iterate" args."named-readtables" args."puri" args."split-sequence" args."string-case" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."yacc" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz'';
@@ -33,8 +33,6 @@ rec {
      (NAME closure-html FILENAME closure-html)
      (NAME collectors FILENAME collectors)
      (NAME css-selectors FILENAME css-selectors) (NAME cxml FILENAME cxml)
-     (NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks)
-     (NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml)
      (NAME flexi-streams FILENAME flexi-streams)
      (NAME iterate FILENAME iterate)
      (NAME named-readtables FILENAME named-readtables)
@@ -47,8 +45,7 @@ rec {
     DEPENDENCIES
     (alexandria babel buildnode cl-html5-parser cl-interpol cl-ppcre cl-unicode
      closer-mop closure-common closure-html collectors css-selectors cxml
-     cxml-dom cxml-klacks cxml-test cxml-xml flexi-streams iterate
-     named-readtables puri split-sequence string-case swank symbol-munger
-     trivial-features trivial-gray-streams yacc)
+     flexi-streams iterate named-readtables puri split-sequence string-case
+     swank symbol-munger trivial-features trivial-gray-streams yacc)
     VERSION css-selectors-20160628-git SIBLINGS
     (css-selectors-stp css-selectors) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix
index 69ada2ce80a..fcdb69f3c35 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''An implementation of css selectors that interacts with cxml-stp'';
 
-  deps = [ args."alexandria" args."babel" args."buildnode" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."css-selectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-stp" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."named-readtables" args."parse-number" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."xpath" args."yacc" ];
+  deps = [ args."alexandria" args."babel" args."buildnode" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."css-selectors" args."cxml" args."cxml-stp" args."flexi-streams" args."iterate" args."named-readtables" args."parse-number" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."xpath" args."yacc" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz'';
@@ -32,9 +32,7 @@ rec {
      (NAME closure-html FILENAME closure-html)
      (NAME collectors FILENAME collectors)
      (NAME css-selectors FILENAME css-selectors) (NAME cxml FILENAME cxml)
-     (NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks)
-     (NAME cxml-stp FILENAME cxml-stp) (NAME cxml-test FILENAME cxml-test)
-     (NAME cxml-xml FILENAME cxml-xml)
+     (NAME cxml-stp FILENAME cxml-stp)
      (NAME flexi-streams FILENAME flexi-streams)
      (NAME iterate FILENAME iterate)
      (NAME named-readtables FILENAME named-readtables)
@@ -46,9 +44,8 @@ rec {
      (NAME xpath FILENAME xpath) (NAME yacc FILENAME yacc))
     DEPENDENCIES
     (alexandria babel buildnode cl-interpol cl-ppcre cl-unicode closer-mop
-     closure-common closure-html collectors css-selectors cxml cxml-dom
-     cxml-klacks cxml-stp cxml-test cxml-xml flexi-streams iterate
-     named-readtables parse-number puri split-sequence swank symbol-munger
-     trivial-features trivial-gray-streams xpath yacc)
+     closure-common closure-html collectors css-selectors cxml cxml-stp
+     flexi-streams iterate named-readtables parse-number puri split-sequence
+     swank symbol-munger trivial-features trivial-gray-streams xpath yacc)
     VERSION css-selectors-20160628-git SIBLINGS
     (css-selectors-simple-tree css-selectors) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix
index 3316f59447d..aa523d6f838 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix
@@ -7,7 +7,7 @@ rec {
 
   description = ''An implementation of css selectors'';
 
-  deps = [ args."alexandria" args."babel" args."buildnode" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."yacc" ];
+  deps = [ args."alexandria" args."babel" args."buildnode" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."yacc" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz'';
@@ -33,8 +33,6 @@ rec {
      (NAME closure-common FILENAME closure-common)
      (NAME closure-html FILENAME closure-html)
      (NAME collectors FILENAME collectors) (NAME cxml FILENAME cxml)
-     (NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks)
-     (NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml)
      (NAME flexi-streams FILENAME flexi-streams)
      (NAME iterate FILENAME iterate) (NAME lisp-unit2 FILENAME lisp-unit2)
      (NAME named-readtables FILENAME named-readtables)
@@ -45,9 +43,8 @@ rec {
      (NAME yacc FILENAME yacc))
     DEPENDENCIES
     (alexandria babel buildnode buildnode-xhtml cl-interpol cl-ppcre cl-unicode
-     closer-mop closure-common closure-html collectors cxml cxml-dom
-     cxml-klacks cxml-test cxml-xml flexi-streams iterate lisp-unit2
-     named-readtables puri split-sequence swank symbol-munger trivial-features
-     trivial-gray-streams yacc)
+     closer-mop closure-common closure-html collectors cxml flexi-streams
+     iterate lisp-unit2 named-readtables puri split-sequence swank
+     symbol-munger trivial-features trivial-gray-streams yacc)
     VERSION 20160628-git SIBLINGS (css-selectors-simple-tree css-selectors-stp)
     PARASITES (css-selectors-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix
index 8fe30fa73a5..74648ba66a8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cxml-stp'';
-  version = ''20120520-git'';
+  version = ''20181018-git'';
 
   parasites = [ "cxml-stp-test" ];
 
   description = '''';
 
-  deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."parse-number" args."puri" args."rt" args."trivial-features" args."trivial-gray-streams" args."xpath" args."yacc" ];
+  deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."parse-number" args."puri" args."rt" args."trivial-features" args."trivial-gray-streams" args."xpath" args."xpath_slash_test" args."yacc" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cxml-stp/2012-05-20/cxml-stp-20120520-git.tgz'';
-    sha256 = ''1pmh7wvkncbwwp30d445mhj21j210swq03f6hm44x1231s8r8azv'';
+    url = ''http://beta.quicklisp.org/archive/cxml-stp/2018-10-18/cxml-stp-20181018-git.tgz'';
+    sha256 = ''0xv6drasndp802mgww53n6hpf0qjh2r7d48rld1qibf20y80bz77'';
   };
 
   packageName = "cxml-stp";
@@ -20,20 +20,18 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cxml-stp DESCRIPTION NIL SHA256
-    1pmh7wvkncbwwp30d445mhj21j210swq03f6hm44x1231s8r8azv URL
-    http://beta.quicklisp.org/archive/cxml-stp/2012-05-20/cxml-stp-20120520-git.tgz
-    MD5 7bc57586a91cd4d4864b8cbad3689d85 NAME cxml-stp FILENAME cxml-stp DEPS
+    0xv6drasndp802mgww53n6hpf0qjh2r7d48rld1qibf20y80bz77 URL
+    http://beta.quicklisp.org/archive/cxml-stp/2018-10-18/cxml-stp-20181018-git.tgz
+    MD5 38d39fce85b270145d5a5bd4668d953f NAME cxml-stp FILENAME cxml-stp DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME cl-ppcre FILENAME cl-ppcre)
      (NAME closure-common FILENAME closure-common) (NAME cxml FILENAME cxml)
-     (NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks)
-     (NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml)
      (NAME parse-number FILENAME parse-number) (NAME puri FILENAME puri)
      (NAME rt FILENAME rt) (NAME trivial-features FILENAME trivial-features)
      (NAME trivial-gray-streams FILENAME trivial-gray-streams)
-     (NAME xpath FILENAME xpath) (NAME yacc FILENAME yacc))
+     (NAME xpath FILENAME xpath) (NAME xpath/test FILENAME xpath_slash_test)
+     (NAME yacc FILENAME yacc))
     DEPENDENCIES
-    (alexandria babel cl-ppcre closure-common cxml cxml-dom cxml-klacks
-     cxml-test cxml-xml parse-number puri rt trivial-features
-     trivial-gray-streams xpath yacc)
-    VERSION 20120520-git SIBLINGS NIL PARASITES (cxml-stp-test)) */
+    (alexandria babel cl-ppcre closure-common cxml parse-number puri rt
+     trivial-features trivial-gray-streams xpath xpath/test yacc)
+    VERSION 20181018-git SIBLINGS NIL PARASITES (cxml-stp-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix
index 56b2645c7ee..68a019fa027 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cxml'';
-  version = ''20110619-git'';
+  version = ''20181018-git'';
 
-  parasites = [ "cxml-dom" "cxml-klacks" "cxml-test" "cxml-xml" ];
+  parasites = [ "cxml/dom" "cxml/klacks" "cxml/test" "cxml/xml" ];
 
-  description = '''';
+  description = ''Closure XML - a Common Lisp XML parser'';
 
   deps = [ args."alexandria" args."babel" args."closure-common" args."puri" args."trivial-features" args."trivial-gray-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz'';
-    sha256 = ''04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk'';
+    url = ''http://beta.quicklisp.org/archive/cxml/2018-10-18/cxml-20181018-git.tgz'';
+    sha256 = ''1s7nfq5zfpxsrayhn0gg3x8fj47mld00qm3cpv5whdqj3wd3krmn'';
   };
 
   packageName = "cxml";
@@ -19,10 +19,10 @@ rec {
   asdFilesToKeep = ["cxml.asd"];
   overrides = x: x;
 }
-/* (SYSTEM cxml DESCRIPTION NIL SHA256
-    04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk URL
-    http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz MD5
-    587755dff60416d4f716f4e785cf747e NAME cxml FILENAME cxml DEPS
+/* (SYSTEM cxml DESCRIPTION Closure XML - a Common Lisp XML parser SHA256
+    1s7nfq5zfpxsrayhn0gg3x8fj47mld00qm3cpv5whdqj3wd3krmn URL
+    http://beta.quicklisp.org/archive/cxml/2018-10-18/cxml-20181018-git.tgz MD5
+    33c5546de7099d65fdb2fbb716fd3de8 NAME cxml FILENAME cxml DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME closure-common FILENAME closure-common) (NAME puri FILENAME puri)
      (NAME trivial-features FILENAME trivial-features)
@@ -30,5 +30,5 @@ rec {
     DEPENDENCIES
     (alexandria babel closure-common puri trivial-features
      trivial-gray-streams)
-    VERSION 20110619-git SIBLINGS NIL PARASITES
-    (cxml-dom cxml-klacks cxml-test cxml-xml)) */
+    VERSION 20181018-git SIBLINGS (cxml-dom cxml-klacks cxml-test) PARASITES
+    (cxml/dom cxml/klacks cxml/test cxml/xml)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
index 218107e95d6..2f863a627bb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''dbd-mysql'';
-  version = ''cl-dbi-20180831-git'';
+  version = ''cl-dbi-20190107-git'';
 
   description = ''Database driver for MySQL.'';
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-annot" args."cl-mysql" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."named-readtables" args."split-sequence" args."trivial-features" args."trivial-types" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz'';
-    sha256 = ''19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9'';
+    url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz'';
+    sha256 = ''02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2'';
   };
 
   packageName = "dbd-mysql";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM dbd-mysql DESCRIPTION Database driver for MySQL. SHA256
-    19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9 URL
-    http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz
-    MD5 2fc95bff95d3cd25e3afeb003ee009d2 NAME dbd-mysql FILENAME dbd-mysql DEPS
+    02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2 URL
+    http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz
+    MD5 349829f5d0bf363b828827ad6728c54e NAME dbd-mysql FILENAME dbd-mysql DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cffi FILENAME cffi) (NAME cl-annot FILENAME cl-annot)
@@ -35,5 +35,5 @@ rec {
     (alexandria babel bordeaux-threads cffi cl-annot cl-mysql cl-syntax
      cl-syntax-annot closer-mop dbi named-readtables split-sequence
      trivial-features trivial-types)
-    VERSION cl-dbi-20180831-git SIBLINGS
+    VERSION cl-dbi-20190107-git SIBLINGS
     (cl-dbi dbd-postgres dbd-sqlite3 dbi-test dbi) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
index 9387806255a..f76f5e7e561 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''dbd-postgres'';
-  version = ''cl-dbi-20180831-git'';
+  version = ''cl-dbi-20190107-git'';
 
   description = ''Database driver for PostgreSQL.'';
 
   deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-postgres" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."md5" args."named-readtables" args."split-sequence" args."trivial-garbage" args."trivial-types" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz'';
-    sha256 = ''19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9'';
+    url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz'';
+    sha256 = ''02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2'';
   };
 
   packageName = "dbd-postgres";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM dbd-postgres DESCRIPTION Database driver for PostgreSQL. SHA256
-    19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9 URL
-    http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz
-    MD5 2fc95bff95d3cd25e3afeb003ee009d2 NAME dbd-postgres FILENAME
+    02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2 URL
+    http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz
+    MD5 349829f5d0bf363b828827ad6728c54e NAME dbd-postgres FILENAME
     dbd-postgres DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -37,5 +37,5 @@ rec {
     (alexandria bordeaux-threads cl-annot cl-postgres cl-syntax cl-syntax-annot
      closer-mop dbi md5 named-readtables split-sequence trivial-garbage
      trivial-types usocket)
-    VERSION cl-dbi-20180831-git SIBLINGS
+    VERSION cl-dbi-20190107-git SIBLINGS
     (cl-dbi dbd-mysql dbd-sqlite3 dbi-test dbi) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
index 808914068a3..01acb76767e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''dbd-sqlite3'';
-  version = ''cl-dbi-20180831-git'';
+  version = ''cl-dbi-20190107-git'';
 
   description = ''Database driver for SQLite3.'';
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."iterate" args."named-readtables" args."split-sequence" args."sqlite" args."trivial-features" args."trivial-types" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz'';
-    sha256 = ''19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9'';
+    url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz'';
+    sha256 = ''02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2'';
   };
 
   packageName = "dbd-sqlite3";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM dbd-sqlite3 DESCRIPTION Database driver for SQLite3. SHA256
-    19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9 URL
-    http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz
-    MD5 2fc95bff95d3cd25e3afeb003ee009d2 NAME dbd-sqlite3 FILENAME dbd-sqlite3
+    02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2 URL
+    http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz
+    MD5 349829f5d0bf363b828827ad6728c54e NAME dbd-sqlite3 FILENAME dbd-sqlite3
     DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -38,5 +38,5 @@ rec {
     (alexandria babel bordeaux-threads cffi cl-annot cl-syntax cl-syntax-annot
      closer-mop dbi iterate named-readtables split-sequence sqlite
      trivial-features trivial-types uiop)
-    VERSION cl-dbi-20180831-git SIBLINGS
+    VERSION cl-dbi-20190107-git SIBLINGS
     (cl-dbi dbd-mysql dbd-postgres dbi-test dbi) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
index 2de381f44b8..382143eb8fb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''dbi'';
-  version = ''cl-20180831-git'';
+  version = ''cl-20190107-git'';
 
   description = ''Database independent interface for Common Lisp'';
 
   deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."named-readtables" args."split-sequence" args."trivial-types" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz'';
-    sha256 = ''19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9'';
+    url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz'';
+    sha256 = ''02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2'';
   };
 
   packageName = "dbi";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM dbi DESCRIPTION Database independent interface for Common Lisp
-    SHA256 19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9 URL
-    http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz
-    MD5 2fc95bff95d3cd25e3afeb003ee009d2 NAME dbi FILENAME dbi DEPS
+    SHA256 02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2 URL
+    http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz
+    MD5 349829f5d0bf363b828827ad6728c54e NAME dbi FILENAME dbi DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cl-annot FILENAME cl-annot) (NAME cl-syntax FILENAME cl-syntax)
@@ -32,5 +32,5 @@ rec {
     DEPENDENCIES
     (alexandria bordeaux-threads cl-annot cl-syntax cl-syntax-annot closer-mop
      named-readtables split-sequence trivial-types)
-    VERSION cl-20180831-git SIBLINGS
+    VERSION cl-20190107-git SIBLINGS
     (cl-dbi dbd-mysql dbd-postgres dbd-sqlite3 dbi-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
index 2e392928f49..c47d9f1a1aa 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''dexador'';
-  version = ''20180831-git'';
+  version = ''20181018-git'';
 
   description = ''Yet another HTTP client for Common Lisp'';
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."local-time" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."usocket" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/dexador/2018-08-31/dexador-20180831-git.tgz'';
-    sha256 = ''1isc4srz2ijg92lpws79ik8vgn9l2pzx4w3aqgri7n3pzfvfn6bs'';
+    url = ''http://beta.quicklisp.org/archive/dexador/2018-10-18/dexador-20181018-git.tgz'';
+    sha256 = ''1pwzydf9paiqxsfawbf7j55h5fqkk0561p3rzflsfnmr1dabi9kc'';
   };
 
   packageName = "dexador";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM dexador DESCRIPTION Yet another HTTP client for Common Lisp SHA256
-    1isc4srz2ijg92lpws79ik8vgn9l2pzx4w3aqgri7n3pzfvfn6bs URL
-    http://beta.quicklisp.org/archive/dexador/2018-08-31/dexador-20180831-git.tgz
-    MD5 f2859026d90e63e79e8e4728168fab13 NAME dexador FILENAME dexador DEPS
+    1pwzydf9paiqxsfawbf7j55h5fqkk0561p3rzflsfnmr1dabi9kc URL
+    http://beta.quicklisp.org/archive/dexador/2018-10-18/dexador-20181018-git.tgz
+    MD5 268ea459fac563834490247de52a6ce1 NAME dexador FILENAME dexador DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
@@ -48,4 +48,4 @@ rec {
      fast-http fast-io flexi-streams local-time proc-parse quri smart-buffer
      split-sequence static-vectors trivial-features trivial-garbage
      trivial-gray-streams trivial-mimes usocket xsubseq)
-    VERSION 20180831-git SIBLINGS (dexador-test) PARASITES NIL) */
+    VERSION 20181018-git SIBLINGS (dexador-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
index 95d335493b7..3dbacdf0f81 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''do-urlencode'';
-  version = ''20170830-git'';
+  version = ''20181018-git'';
 
   description = ''Percent Encoding (aka URL Encoding) library'';
 
-  deps = [ args."alexandria" args."babel" args."babel-streams" args."trivial-features" args."trivial-gray-streams" ];
+  deps = [ args."alexandria" args."babel" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/do-urlencode/2017-08-30/do-urlencode-20170830-git.tgz'';
-    sha256 = ''1584prmmz601fp396qxrivylb7nrnclg9rnwrsnwiij79v6zz40n'';
+    url = ''http://beta.quicklisp.org/archive/do-urlencode/2018-10-18/do-urlencode-20181018-git.tgz'';
+    sha256 = ''1cajd219s515y65kp562c6xczqaq0p4lyp13iv00z6i44rijmfp2'';
   };
 
   packageName = "do-urlencode";
@@ -18,14 +18,11 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM do-urlencode DESCRIPTION Percent Encoding (aka URL Encoding) library
-    SHA256 1584prmmz601fp396qxrivylb7nrnclg9rnwrsnwiij79v6zz40n URL
-    http://beta.quicklisp.org/archive/do-urlencode/2017-08-30/do-urlencode-20170830-git.tgz
-    MD5 071a18bb58ed5c7d5184b34e672b5d91 NAME do-urlencode FILENAME
+    SHA256 1cajd219s515y65kp562c6xczqaq0p4lyp13iv00z6i44rijmfp2 URL
+    http://beta.quicklisp.org/archive/do-urlencode/2018-10-18/do-urlencode-20181018-git.tgz
+    MD5 cb6ab78689fe52680ee1b94cd7738b94 NAME do-urlencode FILENAME
     do-urlencode DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
-     (NAME babel-streams FILENAME babel-streams)
-     (NAME trivial-features FILENAME trivial-features)
-     (NAME trivial-gray-streams FILENAME trivial-gray-streams))
-    DEPENDENCIES
-    (alexandria babel babel-streams trivial-features trivial-gray-streams)
-    VERSION 20170830-git SIBLINGS NIL PARASITES NIL) */
+     (NAME trivial-features FILENAME trivial-features))
+    DEPENDENCIES (alexandria babel trivial-features) VERSION 20181018-git
+    SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
index 36411ca0575..3b2d0225ff9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''esrap'';
-  version = ''20180430-git'';
+  version = ''20190107-git'';
 
   parasites = [ "esrap/tests" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."alexandria" args."fiveam" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/esrap/2018-04-30/esrap-20180430-git.tgz'';
-    sha256 = ''1wv33nzsm6hinr4blfih9napd0gqx8jf8dnnp224h95lhn9fxaav'';
+    url = ''http://beta.quicklisp.org/archive/esrap/2019-01-07/esrap-20190107-git.tgz'';
+    sha256 = ''0kb4szcd7v4qj56p0yg1abvk79is6p5myri3gakzm87l2nmg15xs'';
   };
 
   packageName = "esrap";
@@ -21,9 +21,9 @@ rec {
 }
 /* (SYSTEM esrap DESCRIPTION
     A Packrat / Parsing Grammar / TDPL parser for Common Lisp. SHA256
-    1wv33nzsm6hinr4blfih9napd0gqx8jf8dnnp224h95lhn9fxaav URL
-    http://beta.quicklisp.org/archive/esrap/2018-04-30/esrap-20180430-git.tgz
-    MD5 51efcf9b228ebfe63831db8ba797b0e8 NAME esrap FILENAME esrap DEPS
+    0kb4szcd7v4qj56p0yg1abvk79is6p5myri3gakzm87l2nmg15xs URL
+    http://beta.quicklisp.org/archive/esrap/2019-01-07/esrap-20190107-git.tgz
+    MD5 b8c98e84e3c63e4e3ce2f6c8b4d4bab7 NAME esrap FILENAME esrap DEPS
     ((NAME alexandria FILENAME alexandria) (NAME fiveam FILENAME fiveam))
-    DEPENDENCIES (alexandria fiveam) VERSION 20180430-git SIBLINGS NIL
+    DEPENDENCIES (alexandria fiveam) VERSION 20190107-git SIBLINGS NIL
     PARASITES (esrap/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix
index 29fd1efe2f5..87d9fe983ec 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''fiasco'';
-  version = ''20180228-git'';
+  version = ''20181210-git'';
 
   parasites = [ "fiasco-self-tests" ];
 
   description = ''A Common Lisp test framework that treasures your failures, logical continuation of Stefil.'';
 
-  deps = [ args."alexandria" ];
+  deps = [ args."alexandria" args."trivial-gray-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/fiasco/2018-02-28/fiasco-20180228-git.tgz'';
-    sha256 = ''0a67wvi5whmlw7kiv3b3rzy9kxn9m3135j9cnn92vads66adpxpy'';
+    url = ''http://beta.quicklisp.org/archive/fiasco/2018-12-10/fiasco-20181210-git.tgz'';
+    sha256 = ''0l4wjik8iwipy67lbdrjhcvz7zldv85nykbxasis4zmmh001777y'';
   };
 
   packageName = "fiasco";
@@ -21,8 +21,10 @@ rec {
 }
 /* (SYSTEM fiasco DESCRIPTION
     A Common Lisp test framework that treasures your failures, logical continuation of Stefil.
-    SHA256 0a67wvi5whmlw7kiv3b3rzy9kxn9m3135j9cnn92vads66adpxpy URL
-    http://beta.quicklisp.org/archive/fiasco/2018-02-28/fiasco-20180228-git.tgz
-    MD5 a924e43c335836d2e44731dee6a1b8e6 NAME fiasco FILENAME fiasco DEPS
-    ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) VERSION
-    20180228-git SIBLINGS NIL PARASITES (fiasco-self-tests)) */
+    SHA256 0l4wjik8iwipy67lbdrjhcvz7zldv85nykbxasis4zmmh001777y URL
+    http://beta.quicklisp.org/archive/fiasco/2018-12-10/fiasco-20181210-git.tgz
+    MD5 9d3c0ec30c7f73490188f27eaec00fd8 NAME fiasco FILENAME fiasco DEPS
+    ((NAME alexandria FILENAME alexandria)
+     (NAME trivial-gray-streams FILENAME trivial-gray-streams))
+    DEPENDENCIES (alexandria trivial-gray-streams) VERSION 20181210-git
+    SIBLINGS NIL PARASITES (fiasco-self-tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
index 08b6d35a1fb..d9b25bebddc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''flexi-streams'';
-  version = ''20180711-git'';
+  version = ''20190107-git'';
 
   parasites = [ "flexi-streams-test" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."trivial-gray-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/flexi-streams/2018-07-11/flexi-streams-20180711-git.tgz'';
-    sha256 = ''1g7a5fbl84zx3139kvvgwq6d8bnbpbvq9mr5yj4jzfa6pjfjwgz2'';
+    url = ''http://beta.quicklisp.org/archive/flexi-streams/2019-01-07/flexi-streams-20190107-git.tgz'';
+    sha256 = ''1fqkkvspsdzvrr2rkp6i631m7bwx06j68s19cjzpmnhr9zn696i5'';
   };
 
   packageName = "flexi-streams";
@@ -20,10 +20,10 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM flexi-streams DESCRIPTION Flexible bivalent streams for Common Lisp
-    SHA256 1g7a5fbl84zx3139kvvgwq6d8bnbpbvq9mr5yj4jzfa6pjfjwgz2 URL
-    http://beta.quicklisp.org/archive/flexi-streams/2018-07-11/flexi-streams-20180711-git.tgz
-    MD5 1e5bc255540dcbd71f9cba56573cfb4c NAME flexi-streams FILENAME
+    SHA256 1fqkkvspsdzvrr2rkp6i631m7bwx06j68s19cjzpmnhr9zn696i5 URL
+    http://beta.quicklisp.org/archive/flexi-streams/2019-01-07/flexi-streams-20190107-git.tgz
+    MD5 b59014f9f9f0d1b94f161e36e64a35c2 NAME flexi-streams FILENAME
     flexi-streams DEPS
     ((NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES
-    (trivial-gray-streams) VERSION 20180711-git SIBLINGS NIL PARASITES
+    (trivial-gray-streams) VERSION 20190107-git SIBLINGS NIL PARASITES
     (flexi-streams-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
index 433a31be0d8..3754829ac37 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''http-body'';
-  version = ''20161204-git'';
+  version = ''20181210-git'';
 
   description = ''HTTP POST data parser for Common Lisp'';
 
   deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-annot" args."cl-ppcre" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."jonathan" args."named-readtables" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."trivial-types" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/http-body/2016-12-04/http-body-20161204-git.tgz'';
-    sha256 = ''1y50yipsbl4j99igmfi83pr7p56hb31dcplpy05fp5alkb5rv0gi'';
+    url = ''http://beta.quicklisp.org/archive/http-body/2018-12-10/http-body-20181210-git.tgz'';
+    sha256 = ''170w8rcabf72yq2w9a8134n1sgy7mgirkdj9fzwbr29gqv93plcz'';
   };
 
   packageName = "http-body";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM http-body DESCRIPTION HTTP POST data parser for Common Lisp SHA256
-    1y50yipsbl4j99igmfi83pr7p56hb31dcplpy05fp5alkb5rv0gi URL
-    http://beta.quicklisp.org/archive/http-body/2016-12-04/http-body-20161204-git.tgz
-    MD5 6eda50cf89aa3b6a8e9ccaf324734a0e NAME http-body FILENAME http-body DEPS
+    170w8rcabf72yq2w9a8134n1sgy7mgirkdj9fzwbr29gqv93plcz URL
+    http://beta.quicklisp.org/archive/http-body/2018-12-10/http-body-20181210-git.tgz
+    MD5 9699bbb11386c6e4d5cf35bea30dbf7f NAME http-body FILENAME http-body DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
      (NAME cffi-toolchain FILENAME cffi-toolchain)
@@ -46,4 +46,4 @@ rec {
      jonathan named-readtables proc-parse quri smart-buffer split-sequence
      static-vectors trivial-features trivial-gray-streams trivial-types
      xsubseq)
-    VERSION 20161204-git SIBLINGS (http-body-test) PARASITES NIL) */
+    VERSION 20181210-git SIBLINGS (http-body-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
index 3d259fc5b6c..4c3bcbb42b0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''ironclad'';
-  version = ''v0.42'';
+  version = ''v0.44'';
 
   parasites = [ "ironclad/tests" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."nibbles" args."rt" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/ironclad/2018-08-31/ironclad-v0.42.tgz'';
-    sha256 = ''1rrw0mhvja407ycryw56wwm45cpf3dc73h965smy75ddha4xn7zr'';
+    url = ''http://beta.quicklisp.org/archive/ironclad/2018-12-10/ironclad-v0.44.tgz'';
+    sha256 = ''0qxvvv9hp6843s3n4fnj2fl26xzdpnk91j1h0sgi8v0fbfakwl2y'';
   };
 
   packageName = "ironclad";
@@ -21,9 +21,9 @@ rec {
 }
 /* (SYSTEM ironclad DESCRIPTION
     A cryptographic toolkit written in pure Common Lisp SHA256
-    1rrw0mhvja407ycryw56wwm45cpf3dc73h965smy75ddha4xn7zr URL
-    http://beta.quicklisp.org/archive/ironclad/2018-08-31/ironclad-v0.42.tgz
-    MD5 18f2dbc9dbff97de9ea44af5344485b5 NAME ironclad FILENAME ironclad DEPS
+    0qxvvv9hp6843s3n4fnj2fl26xzdpnk91j1h0sgi8v0fbfakwl2y URL
+    http://beta.quicklisp.org/archive/ironclad/2018-12-10/ironclad-v0.44.tgz
+    MD5 ebce1cbac421a5d7ad461cdaed4ac863 NAME ironclad FILENAME ironclad DEPS
     ((NAME nibbles FILENAME nibbles) (NAME rt FILENAME rt)) DEPENDENCIES
-    (nibbles rt) VERSION v0.42 SIBLINGS (ironclad-text) PARASITES
+    (nibbles rt) VERSION v0.44 SIBLINGS (ironclad-text) PARASITES
     (ironclad/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
index ae323790ba0..81493865b86 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''jonathan'';
-  version = ''20180430-git'';
+  version = ''20181210-git'';
 
   description = ''High performance JSON encoder and decoder. Currently support: SBCL, CCL.'';
 
   deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-annot" args."cl-ppcre" args."cl-syntax" args."cl-syntax-annot" args."fast-io" args."named-readtables" args."proc-parse" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."trivial-types" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/jonathan/2018-04-30/jonathan-20180430-git.tgz'';
-    sha256 = ''0kv6jwd5rimfgydwfgn87wa9m4w4cnsmsx2n284jx9z7frqspdz0'';
+    url = ''http://beta.quicklisp.org/archive/jonathan/2018-12-10/jonathan-20181210-git.tgz'';
+    sha256 = ''1m0cz8r48zvwbsywrgj9zdlfy48iycxb4h9l8wg04gmb5xv82rxh'';
   };
 
   packageName = "jonathan";
@@ -19,9 +19,9 @@ rec {
 }
 /* (SYSTEM jonathan DESCRIPTION
     High performance JSON encoder and decoder. Currently support: SBCL, CCL.
-    SHA256 0kv6jwd5rimfgydwfgn87wa9m4w4cnsmsx2n284jx9z7frqspdz0 URL
-    http://beta.quicklisp.org/archive/jonathan/2018-04-30/jonathan-20180430-git.tgz
-    MD5 7dc695be1b571f19aa9cd2b13aa231bb NAME jonathan FILENAME jonathan DEPS
+    SHA256 1m0cz8r48zvwbsywrgj9zdlfy48iycxb4h9l8wg04gmb5xv82rxh URL
+    http://beta.quicklisp.org/archive/jonathan/2018-12-10/jonathan-20181210-git.tgz
+    MD5 eb76f293df02d1b85faf92b92cb24d53 NAME jonathan FILENAME jonathan DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
      (NAME cffi-toolchain FILENAME cffi-toolchain)
@@ -39,4 +39,4 @@ rec {
     (alexandria babel cffi cffi-grovel cffi-toolchain cl-annot cl-ppcre
      cl-syntax cl-syntax-annot fast-io named-readtables proc-parse
      static-vectors trivial-features trivial-gray-streams trivial-types)
-    VERSION 20180430-git SIBLINGS (jonathan-test) PARASITES NIL) */
+    VERSION 20181210-git SIBLINGS (jonathan-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
index 94edb06e6ae..b99f7867a7a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''lack-component'';
-  version = ''lack-20180831-git'';
+  version = ''lack-20181210-git'';
 
   description = '''';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz'';
-    sha256 = ''0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n'';
+    url = ''http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz'';
+    sha256 = ''00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8'';
   };
 
   packageName = "lack-component";
@@ -18,10 +18,10 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM lack-component DESCRIPTION NIL SHA256
-    0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n URL
-    http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz MD5
-    fd57a7185997a1a5f37bbd9d6899118d NAME lack-component FILENAME
-    lack-component DEPS NIL DEPENDENCIES NIL VERSION lack-20180831-git SIBLINGS
+    00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8 URL
+    http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz MD5
+    b75ab822b0b1d7fa5ff4d47db3ec80dd NAME lack-component FILENAME
+    lack-component DEPS NIL DEPENDENCIES NIL VERSION lack-20181210-git SIBLINGS
     (lack-middleware-accesslog lack-middleware-auth-basic
      lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount
      lack-middleware-session lack-middleware-static lack-request lack-response
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
index a98028e0c06..7cce4b21294 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''lack-middleware-backtrace'';
-  version = ''lack-20180831-git'';
+  version = ''lack-20181210-git'';
 
   description = '''';
 
   deps = [ args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz'';
-    sha256 = ''0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n'';
+    url = ''http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz'';
+    sha256 = ''00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8'';
   };
 
   packageName = "lack-middleware-backtrace";
@@ -18,11 +18,11 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM lack-middleware-backtrace DESCRIPTION NIL SHA256
-    0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n URL
-    http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz MD5
-    fd57a7185997a1a5f37bbd9d6899118d NAME lack-middleware-backtrace FILENAME
+    00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8 URL
+    http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz MD5
+    b75ab822b0b1d7fa5ff4d47db3ec80dd NAME lack-middleware-backtrace FILENAME
     lack-middleware-backtrace DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES
-    (uiop) VERSION lack-20180831-git SIBLINGS
+    (uiop) VERSION lack-20181210-git SIBLINGS
     (lack-component lack-middleware-accesslog lack-middleware-auth-basic
      lack-middleware-csrf lack-middleware-mount lack-middleware-session
      lack-middleware-static lack-request lack-response lack-session-store-dbi
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
index 3478ac8488b..6da62f22f65 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''lack-util'';
-  version = ''lack-20180831-git'';
+  version = ''lack-20181210-git'';
 
   description = '''';
 
   deps = [ args."ironclad" args."nibbles" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz'';
-    sha256 = ''0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n'';
+    url = ''http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz'';
+    sha256 = ''00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8'';
   };
 
   packageName = "lack-util";
@@ -18,11 +18,11 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM lack-util DESCRIPTION NIL SHA256
-    0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n URL
-    http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz MD5
-    fd57a7185997a1a5f37bbd9d6899118d NAME lack-util FILENAME lack-util DEPS
+    00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8 URL
+    http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz MD5
+    b75ab822b0b1d7fa5ff4d47db3ec80dd NAME lack-util FILENAME lack-util DEPS
     ((NAME ironclad FILENAME ironclad) (NAME nibbles FILENAME nibbles))
-    DEPENDENCIES (ironclad nibbles) VERSION lack-20180831-git SIBLINGS
+    DEPENDENCIES (ironclad nibbles) VERSION lack-20181210-git SIBLINGS
     (lack-component lack-middleware-accesslog lack-middleware-auth-basic
      lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount
      lack-middleware-session lack-middleware-static lack-request lack-response
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
index fdcda10a275..c8ef9a7f670 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''lack'';
-  version = ''20180831-git'';
+  version = ''20181210-git'';
 
   description = ''A minimal Clack'';
 
   deps = [ args."ironclad" args."lack-component" args."lack-util" args."nibbles" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz'';
-    sha256 = ''0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n'';
+    url = ''http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz'';
+    sha256 = ''00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8'';
   };
 
   packageName = "lack";
@@ -18,14 +18,14 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM lack DESCRIPTION A minimal Clack SHA256
-    0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n URL
-    http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz MD5
-    fd57a7185997a1a5f37bbd9d6899118d NAME lack FILENAME lack DEPS
+    00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8 URL
+    http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz MD5
+    b75ab822b0b1d7fa5ff4d47db3ec80dd NAME lack FILENAME lack DEPS
     ((NAME ironclad FILENAME ironclad)
      (NAME lack-component FILENAME lack-component)
      (NAME lack-util FILENAME lack-util) (NAME nibbles FILENAME nibbles))
     DEPENDENCIES (ironclad lack-component lack-util nibbles) VERSION
-    20180831-git SIBLINGS
+    20181210-git SIBLINGS
     (lack-component lack-middleware-accesslog lack-middleware-auth-basic
      lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount
      lack-middleware-session lack-middleware-static lack-request lack-response
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
index a123b7ed3c0..1a94c643d8a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''local-time'';
-  version = ''20180228-git'';
+  version = ''20181210-git'';
 
   parasites = [ "local-time/test" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."alexandria" args."bordeaux-threads" args."cl-fad" args."stefil" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/local-time/2018-02-28/local-time-20180228-git.tgz'';
-    sha256 = ''0s38rm8rjr4m34ibrvd42y0qgchfqs1pvfm0yv46wbhgg24jgbm1'';
+    url = ''http://beta.quicklisp.org/archive/local-time/2018-12-10/local-time-20181210-git.tgz'';
+    sha256 = ''0m17mjql9f2glr9f2cg5d2dk5gi2xjjqxih18dx71jpbd71m6q4s'';
   };
 
   packageName = "local-time";
@@ -21,12 +21,12 @@ rec {
 }
 /* (SYSTEM local-time DESCRIPTION
     A library for manipulating dates and times, based on a paper by Erik Naggum
-    SHA256 0s38rm8rjr4m34ibrvd42y0qgchfqs1pvfm0yv46wbhgg24jgbm1 URL
-    http://beta.quicklisp.org/archive/local-time/2018-02-28/local-time-20180228-git.tgz
-    MD5 6bb475cb979c4ba004ef4f4c970dec47 NAME local-time FILENAME local-time
+    SHA256 0m17mjql9f2glr9f2cg5d2dk5gi2xjjqxih18dx71jpbd71m6q4s URL
+    http://beta.quicklisp.org/archive/local-time/2018-12-10/local-time-20181210-git.tgz
+    MD5 161762ecff2ffbe4dc68c8dc28472515 NAME local-time FILENAME local-time
     DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cl-fad FILENAME cl-fad) (NAME stefil FILENAME stefil))
     DEPENDENCIES (alexandria bordeaux-threads cl-fad stefil) VERSION
-    20180228-git SIBLINGS (cl-postgres+local-time) PARASITES (local-time/test)) */
+    20181210-git SIBLINGS (cl-postgres+local-time) PARASITES (local-time/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
index ad335774cbb..19382889315 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''lquery'';
-  version = ''20180831-git'';
+  version = ''20190107-git'';
 
   description = ''A library to allow jQuery-like HTML/DOM manipulation.'';
 
   deps = [ args."array-utils" args."clss" args."documentation-utils" args."form-fiddle" args."plump" args."trivial-indent" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lquery/2018-08-31/lquery-20180831-git.tgz'';
-    sha256 = ''1nb2hvcw043qlqxch7lky67k0r9gxjwaggkm8hfznlijbkgbfy2v'';
+    url = ''http://beta.quicklisp.org/archive/lquery/2019-01-07/lquery-20190107-git.tgz'';
+    sha256 = ''023w4hsclqhw9bg1rfva0sapqmnmgsvf9gngbfhqcfgsdf7wff9r'';
   };
 
   packageName = "lquery";
@@ -19,13 +19,13 @@ rec {
 }
 /* (SYSTEM lquery DESCRIPTION
     A library to allow jQuery-like HTML/DOM manipulation. SHA256
-    1nb2hvcw043qlqxch7lky67k0r9gxjwaggkm8hfznlijbkgbfy2v URL
-    http://beta.quicklisp.org/archive/lquery/2018-08-31/lquery-20180831-git.tgz
-    MD5 d0d3efa47f151afeb754c4bc0c059acf NAME lquery FILENAME lquery DEPS
+    023w4hsclqhw9bg1rfva0sapqmnmgsvf9gngbfhqcfgsdf7wff9r URL
+    http://beta.quicklisp.org/archive/lquery/2019-01-07/lquery-20190107-git.tgz
+    MD5 295245984aa471d2709dcf926abd82e2 NAME lquery FILENAME lquery DEPS
     ((NAME array-utils FILENAME array-utils) (NAME clss FILENAME clss)
      (NAME documentation-utils FILENAME documentation-utils)
      (NAME form-fiddle FILENAME form-fiddle) (NAME plump FILENAME plump)
      (NAME trivial-indent FILENAME trivial-indent))
     DEPENDENCIES
     (array-utils clss documentation-utils form-fiddle plump trivial-indent)
-    VERSION 20180831-git SIBLINGS (lquery-test) PARASITES NIL) */
+    VERSION 20190107-git SIBLINGS (lquery-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix
index fe2fc42a18b..068d0eba69d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''myway'';
-  version = ''20150302-git'';
+  version = ''20181018-git'';
 
   description = ''Sinatra-compatible routing library.'';
 
   deps = [ args."alexandria" args."babel" args."cl-ppcre" args."cl-utilities" args."map-set" args."quri" args."split-sequence" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/myway/2015-03-02/myway-20150302-git.tgz'';
-    sha256 = ''1spab9zzhwjg3r5xncr5ncha7phw72wp49cxxncgphh1lfaiyblh'';
+    url = ''http://beta.quicklisp.org/archive/myway/2018-10-18/myway-20181018-git.tgz'';
+    sha256 = ''0ffd92mmir2k6i4771ppqvb3xhqlk2yh5znx7i391vq5ji3k5jij'';
   };
 
   packageName = "myway";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM myway DESCRIPTION Sinatra-compatible routing library. SHA256
-    1spab9zzhwjg3r5xncr5ncha7phw72wp49cxxncgphh1lfaiyblh URL
-    http://beta.quicklisp.org/archive/myway/2015-03-02/myway-20150302-git.tgz
-    MD5 6a16b41eb3216c469bfc8783cce08b01 NAME myway FILENAME myway DEPS
+    0ffd92mmir2k6i4771ppqvb3xhqlk2yh5znx7i391vq5ji3k5jij URL
+    http://beta.quicklisp.org/archive/myway/2018-10-18/myway-20181018-git.tgz
+    MD5 88adecdaec89ceb262559d443512e545 NAME myway FILENAME myway DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME cl-ppcre FILENAME cl-ppcre)
      (NAME cl-utilities FILENAME cl-utilities) (NAME map-set FILENAME map-set)
@@ -29,4 +29,4 @@ rec {
     DEPENDENCIES
     (alexandria babel cl-ppcre cl-utilities map-set quri split-sequence
      trivial-features)
-    VERSION 20150302-git SIBLINGS (myway-test) PARASITES NIL) */
+    VERSION 20181018-git SIBLINGS (myway-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
index bb5121667ac..bf6216dcadd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''parenscript'';
-  version = ''Parenscript-2.6'';
+  version = ''Parenscript-2.7.1'';
 
   description = ''Lisp to JavaScript transpiler'';
 
   deps = [ args."anaphora" args."cl-ppcre" args."named-readtables" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/parenscript/2016-03-18/Parenscript-2.6.tgz'';
-    sha256 = ''1hvr407fz7gzaxqbnki4k3l44qvl7vk6p5pn7811nrv6lk3kp5li'';
+    url = ''http://beta.quicklisp.org/archive/parenscript/2018-12-10/Parenscript-2.7.1.tgz'';
+    sha256 = ''1vbldjzj9py8vqyk0f3rb795cjai0h7p858dflm4l8p0kp4mll6f'';
   };
 
   packageName = "parenscript";
@@ -18,11 +18,11 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM parenscript DESCRIPTION Lisp to JavaScript transpiler SHA256
-    1hvr407fz7gzaxqbnki4k3l44qvl7vk6p5pn7811nrv6lk3kp5li URL
-    http://beta.quicklisp.org/archive/parenscript/2016-03-18/Parenscript-2.6.tgz
-    MD5 dadecc13f2918bc618fb143e893deb99 NAME parenscript FILENAME parenscript
+    1vbldjzj9py8vqyk0f3rb795cjai0h7p858dflm4l8p0kp4mll6f URL
+    http://beta.quicklisp.org/archive/parenscript/2018-12-10/Parenscript-2.7.1.tgz
+    MD5 047c9a72bd36f1b4a5ec67af9453a0b9 NAME parenscript FILENAME parenscript
     DEPS
     ((NAME anaphora FILENAME anaphora) (NAME cl-ppcre FILENAME cl-ppcre)
      (NAME named-readtables FILENAME named-readtables))
-    DEPENDENCIES (anaphora cl-ppcre named-readtables) VERSION Parenscript-2.6
-    SIBLINGS (parenscript.test) PARASITES NIL) */
+    DEPENDENCIES (anaphora cl-ppcre named-readtables) VERSION Parenscript-2.7.1
+    SIBLINGS (parenscript.tests) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
index 0a1591d7c42..9f36a671765 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''plump'';
-  version = ''20180831-git'';
+  version = ''20190107-git'';
 
   description = ''An XML / XHTML / HTML parser that aims to be as lenient as possible.'';
 
   deps = [ args."array-utils" args."documentation-utils" args."trivial-indent" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/plump/2018-08-31/plump-20180831-git.tgz'';
-    sha256 = ''0pa4z9yjm68lpw1hdidicrwj7dfvf2jk110rnqq6p8ahxc117zbf'';
+    url = ''http://beta.quicklisp.org/archive/plump/2019-01-07/plump-20190107-git.tgz'';
+    sha256 = ''0kc93374dvr9mz6k4c0xx47jjx5sjrxs151vnnpx8jxr4cc620l3'';
   };
 
   packageName = "plump";
@@ -19,11 +19,11 @@ rec {
 }
 /* (SYSTEM plump DESCRIPTION
     An XML / XHTML / HTML parser that aims to be as lenient as possible. SHA256
-    0pa4z9yjm68lpw1hdidicrwj7dfvf2jk110rnqq6p8ahxc117zbf URL
-    http://beta.quicklisp.org/archive/plump/2018-08-31/plump-20180831-git.tgz
-    MD5 5a899a19906fd22fb0cb1c65eb584891 NAME plump FILENAME plump DEPS
+    0kc93374dvr9mz6k4c0xx47jjx5sjrxs151vnnpx8jxr4cc620l3 URL
+    http://beta.quicklisp.org/archive/plump/2019-01-07/plump-20190107-git.tgz
+    MD5 5b1a46b83536d5bf1a082a1ef191d3aa NAME plump FILENAME plump DEPS
     ((NAME array-utils FILENAME array-utils)
      (NAME documentation-utils FILENAME documentation-utils)
      (NAME trivial-indent FILENAME trivial-indent))
     DEPENDENCIES (array-utils documentation-utils trivial-indent) VERSION
-    20180831-git SIBLINGS (plump-dom plump-lexer plump-parser) PARASITES NIL) */
+    20190107-git SIBLINGS (plump-dom plump-lexer plump-parser) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
index da8cb466b41..589f6917899 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''query-fs'';
-  version = ''20160531-git'';
+  version = ''20190107-git'';
 
   description = ''High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries'';
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-fuse" args."cl-fuse-meta-fs" args."cl-ppcre" args."cl-utilities" args."command-line-arguments" args."iterate" args."pcall" args."pcall-queue" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/query-fs/2016-05-31/query-fs-20160531-git.tgz'';
-    sha256 = ''0wknr3rffihg1my8ihmpwssxpxj4bfmqcly0s37q51fllxkr1v5a'';
+    url = ''http://beta.quicklisp.org/archive/query-fs/2019-01-07/query-fs-20190107-git.tgz'';
+    sha256 = ''1980k3l970ma1571myr66nxaxkg2vzf81a2wn28qcx40niy6pbq4'';
   };
 
   packageName = "query-fs";
@@ -19,9 +19,9 @@ rec {
 }
 /* (SYSTEM query-fs DESCRIPTION
     High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries
-    SHA256 0wknr3rffihg1my8ihmpwssxpxj4bfmqcly0s37q51fllxkr1v5a URL
-    http://beta.quicklisp.org/archive/query-fs/2016-05-31/query-fs-20160531-git.tgz
-    MD5 dfbb3d0e7b5d990488a17b184771d049 NAME query-fs FILENAME query-fs DEPS
+    SHA256 1980k3l970ma1571myr66nxaxkg2vzf81a2wn28qcx40niy6pbq4 URL
+    http://beta.quicklisp.org/archive/query-fs/2019-01-07/query-fs-20190107-git.tgz
+    MD5 3abd1f0a2f82d10d919bb5b4aa5485be NAME query-fs FILENAME query-fs DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
@@ -40,4 +40,4 @@ rec {
     (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-fuse
      cl-fuse-meta-fs cl-ppcre cl-utilities command-line-arguments iterate pcall
      pcall-queue trivial-backtrace trivial-features trivial-utf-8)
-    VERSION 20160531-git SIBLINGS NIL PARASITES NIL) */
+    VERSION 20190107-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
index 75eade4d317..2f30db52448 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''quri'';
-  version = ''20161204-git'';
+  version = ''20181210-git'';
 
   description = ''Yet another URI library for Common Lisp'';
 
   deps = [ args."alexandria" args."babel" args."cl-utilities" args."split-sequence" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/quri/2016-12-04/quri-20161204-git.tgz'';
-    sha256 = ''14if83kd2mv68p4g4ch2w796w3micpzv40z7xrcwzwj64wngwabv'';
+    url = ''http://beta.quicklisp.org/archive/quri/2018-12-10/quri-20181210-git.tgz'';
+    sha256 = ''0iy2q1jg1j07sw5al6c325zkwcbs218z3dszd785vl89ms6kjyn4'';
   };
 
   packageName = "quri";
@@ -18,13 +18,13 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM quri DESCRIPTION Yet another URI library for Common Lisp SHA256
-    14if83kd2mv68p4g4ch2w796w3micpzv40z7xrcwzwj64wngwabv URL
-    http://beta.quicklisp.org/archive/quri/2016-12-04/quri-20161204-git.tgz MD5
-    8c87e99d4f7308d83aab361a6e36508a NAME quri FILENAME quri DEPS
+    0iy2q1jg1j07sw5al6c325zkwcbs218z3dszd785vl89ms6kjyn4 URL
+    http://beta.quicklisp.org/archive/quri/2018-12-10/quri-20181210-git.tgz MD5
+    94f607540ccc8a15a4439527e41bf7ac NAME quri FILENAME quri DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME cl-utilities FILENAME cl-utilities)
      (NAME split-sequence FILENAME split-sequence)
      (NAME trivial-features FILENAME trivial-features))
     DEPENDENCIES
     (alexandria babel cl-utilities split-sequence trivial-features) VERSION
-    20161204-git SIBLINGS (quri-test) PARASITES NIL) */
+    20181210-git SIBLINGS (quri-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
index b1e89b3eef8..86890d60dc5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''simple-date'';
-  version = ''postmodern-20180831-git'';
+  version = ''postmodern-20190107-git'';
 
-  parasites = [ "simple-date/postgres-glue" ];
+  parasites = [ "simple-date/postgres-glue" "simple-date/tests" ];
 
   description = '''';
 
-  deps = [ args."cl-postgres" args."md5" args."usocket" ];
+  deps = [ args."cl-postgres" args."fiveam" args."md5" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/postmodern/2018-08-31/postmodern-20180831-git.tgz'';
-    sha256 = ''062xhy6aadzgmwpz8h0n7884yv5m4nwqmxrc75m3c60k1lmccpwx'';
+    url = ''http://beta.quicklisp.org/archive/postmodern/2019-01-07/postmodern-20190107-git.tgz'';
+    sha256 = ''030p5kp593p4z7p3k0828dlayglw2si3q187z1fafgpvspp42sd5'';
   };
 
   packageName = "simple-date";
@@ -20,12 +20,12 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM simple-date DESCRIPTION NIL SHA256
-    062xhy6aadzgmwpz8h0n7884yv5m4nwqmxrc75m3c60k1lmccpwx URL
-    http://beta.quicklisp.org/archive/postmodern/2018-08-31/postmodern-20180831-git.tgz
-    MD5 78c3e998cff7305db5e4b4e90b9bbee6 NAME simple-date FILENAME simple-date
+    030p5kp593p4z7p3k0828dlayglw2si3q187z1fafgpvspp42sd5 URL
+    http://beta.quicklisp.org/archive/postmodern/2019-01-07/postmodern-20190107-git.tgz
+    MD5 3f6f78c4fb0f5a8bb9f13247f1f3d6eb NAME simple-date FILENAME simple-date
     DEPS
-    ((NAME cl-postgres FILENAME cl-postgres) (NAME md5 FILENAME md5)
-     (NAME usocket FILENAME usocket))
-    DEPENDENCIES (cl-postgres md5 usocket) VERSION postmodern-20180831-git
-    SIBLINGS (cl-postgres postmodern s-sql) PARASITES
-    (simple-date/postgres-glue)) */
+    ((NAME cl-postgres FILENAME cl-postgres) (NAME fiveam FILENAME fiveam)
+     (NAME md5 FILENAME md5) (NAME usocket FILENAME usocket))
+    DEPENDENCIES (cl-postgres fiveam md5 usocket) VERSION
+    postmodern-20190107-git SIBLINGS (cl-postgres postmodern s-sql) PARASITES
+    (simple-date/postgres-glue simple-date/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
index 4db468081da..f0a21983f16 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''split-sequence'';
-  version = ''v1.4.1'';
+  version = ''v1.5.0'';
 
   parasites = [ "split-sequence/tests" ];
 
@@ -11,8 +11,8 @@ rec {
   deps = [ args."fiveam" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/split-sequence/2018-02-28/split-sequence-v1.4.1.tgz'';
-    sha256 = ''04ag6cdllqhc45psjp7bcwkhnqdhpidi8grn15c7pnaf86apgq3q'';
+    url = ''http://beta.quicklisp.org/archive/split-sequence/2018-10-18/split-sequence-v1.5.0.tgz'';
+    sha256 = ''0cxdgprb8c15fydm09aqvc8sdp5n87m6khv70kzkms1n2vm6sb0g'';
   };
 
   packageName = "split-sequence";
@@ -23,8 +23,8 @@ rec {
 /* (SYSTEM split-sequence DESCRIPTION
     Splits a sequence into a list of subsequences
   delimited by objects satisfying a test.
-    SHA256 04ag6cdllqhc45psjp7bcwkhnqdhpidi8grn15c7pnaf86apgq3q URL
-    http://beta.quicklisp.org/archive/split-sequence/2018-02-28/split-sequence-v1.4.1.tgz
-    MD5 b85e3ef2bc2cb2ce8a2c101759539ba7 NAME split-sequence FILENAME
+    SHA256 0cxdgprb8c15fydm09aqvc8sdp5n87m6khv70kzkms1n2vm6sb0g URL
+    http://beta.quicklisp.org/archive/split-sequence/2018-10-18/split-sequence-v1.5.0.tgz
+    MD5 67844853787187d993e6d530306eb2b4 NAME split-sequence FILENAME
     split-sequence DEPS ((NAME fiveam FILENAME fiveam)) DEPENDENCIES (fiveam)
-    VERSION v1.4.1 SIBLINGS NIL PARASITES (split-sequence/tests)) */
+    VERSION v1.5.0 SIBLINGS NIL PARASITES (split-sequence/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix
index 0dca605c1fd..df63a5c9836 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''stefil'';
-  version = ''20101107-darcs'';
+  version = ''20181210-git'';
 
   parasites = [ "stefil-test" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."alexandria" args."iterate" args."metabang-bind" args."swank" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/stefil/2010-11-07/stefil-20101107-darcs.tgz'';
-    sha256 = ''0d81js0p02plv7wy1640xmghb4s06gay76pqw2k3dnamkglcglz3'';
+    url = ''http://beta.quicklisp.org/archive/stefil/2018-12-10/stefil-20181210-git.tgz'';
+    sha256 = ''10dr8yjrjc2pyx55knds5llh9k716khlvbkmpxh0vn8rdmxmz96g'';
   };
 
   packageName = "stefil";
@@ -20,10 +20,10 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM stefil DESCRIPTION Stefil - Simple Test Framework In Lisp SHA256
-    0d81js0p02plv7wy1640xmghb4s06gay76pqw2k3dnamkglcglz3 URL
-    http://beta.quicklisp.org/archive/stefil/2010-11-07/stefil-20101107-darcs.tgz
-    MD5 8c56bc03e7679e4d42bb3bb3b101de80 NAME stefil FILENAME stefil DEPS
+    10dr8yjrjc2pyx55knds5llh9k716khlvbkmpxh0vn8rdmxmz96g URL
+    http://beta.quicklisp.org/archive/stefil/2018-12-10/stefil-20181210-git.tgz
+    MD5 3418bf358366748593f65e4b6e1bb8cf NAME stefil FILENAME stefil DEPS
     ((NAME alexandria FILENAME alexandria) (NAME iterate FILENAME iterate)
      (NAME metabang-bind FILENAME metabang-bind) (NAME swank FILENAME swank))
-    DEPENDENCIES (alexandria iterate metabang-bind swank) VERSION
-    20101107-darcs SIBLINGS NIL PARASITES (stefil-test)) */
+    DEPENDENCIES (alexandria iterate metabang-bind swank) VERSION 20181210-git
+    SIBLINGS NIL PARASITES (stefil-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
index bb39c74c962..e75cb087f38 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''stumpwm'';
-  version = ''20180831-git'';
+  version = ''20190107-git'';
 
   description = ''A tiling, keyboard driven window manager'';
 
   deps = [ args."alexandria" args."cl-ppcre" args."clx" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/stumpwm/2018-08-31/stumpwm-20180831-git.tgz'';
-    sha256 = ''1zis6aqdr18vd78wl9jpv2fmbzn37zvhb6gj44dpfydl67hjc89w'';
+    url = ''http://beta.quicklisp.org/archive/stumpwm/2019-01-07/stumpwm-20190107-git.tgz'';
+    sha256 = ''1i9l1jaxa38fp6s3wmbg5cnn27j4ry8z1mh3w5bhyq0b54zxbcar'';
   };
 
   packageName = "stumpwm";
@@ -18,10 +18,10 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM stumpwm DESCRIPTION A tiling, keyboard driven window manager SHA256
-    1zis6aqdr18vd78wl9jpv2fmbzn37zvhb6gj44dpfydl67hjc89w URL
-    http://beta.quicklisp.org/archive/stumpwm/2018-08-31/stumpwm-20180831-git.tgz
-    MD5 a523654c5f7ffdfe6c6c4f37e9499851 NAME stumpwm FILENAME stumpwm DEPS
+    1i9l1jaxa38fp6s3wmbg5cnn27j4ry8z1mh3w5bhyq0b54zxbcar URL
+    http://beta.quicklisp.org/archive/stumpwm/2019-01-07/stumpwm-20190107-git.tgz
+    MD5 5634a308f5b40d9bab1f7c066aa6b9df NAME stumpwm FILENAME stumpwm DEPS
     ((NAME alexandria FILENAME alexandria) (NAME cl-ppcre FILENAME cl-ppcre)
      (NAME clx FILENAME clx))
-    DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20180831-git SIBLINGS
+    DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20190107-git SIBLINGS
     (stumpwm-tests) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix
index 9734118526c..301b12a8998 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''swank'';
-  version = ''slime-v2.22'';
+  version = ''slime-v2.23'';
 
   description = '''';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/slime/2018-08-31/slime-v2.22.tgz'';
-    sha256 = ''0ql0bjijypghi884085idq542yms2gk4rq1035j3vznkqrlnaqbk'';
+    url = ''http://beta.quicklisp.org/archive/slime/2019-01-07/slime-v2.23.tgz'';
+    sha256 = ''1ml602yq5s38x0syg0grik8i4h01jw06yja87vpkjl3mkxqvxvky'';
   };
 
   packageName = "swank";
@@ -18,7 +18,7 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM swank DESCRIPTION NIL SHA256
-    0ql0bjijypghi884085idq542yms2gk4rq1035j3vznkqrlnaqbk URL
-    http://beta.quicklisp.org/archive/slime/2018-08-31/slime-v2.22.tgz MD5
-    edf090905d4f3a54ef62f8c13972bba5 NAME swank FILENAME swank DEPS NIL
-    DEPENDENCIES NIL VERSION slime-v2.22 SIBLINGS NIL PARASITES NIL) */
+    1ml602yq5s38x0syg0grik8i4h01jw06yja87vpkjl3mkxqvxvky URL
+    http://beta.quicklisp.org/archive/slime/2019-01-07/slime-v2.23.tgz MD5
+    726724480d861d97e8b58bc8f9f27697 NAME swank FILENAME swank DEPS NIL
+    DEPENDENCIES NIL VERSION slime-v2.23 SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
index 7c3a01f5d11..5c3c486fb0f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''trivial-garbage'';
-  version = ''20150113-git'';
+  version = ''20181018-git'';
 
   parasites = [ "trivial-garbage-tests" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."rt" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-garbage/2015-01-13/trivial-garbage-20150113-git.tgz'';
-    sha256 = ''1yy1jyx7wz5rr7lr0jyyfxgzfddmrxrmkp46a21pcdc4jlss1h08'';
+    url = ''http://beta.quicklisp.org/archive/trivial-garbage/2018-10-18/trivial-garbage-20181018-git.tgz'';
+    sha256 = ''0hiflg8iak99bbgv0lqj6zwqyklx85ixp7yp4r8xzzm61ya613pl'';
   };
 
   packageName = "trivial-garbage";
@@ -21,8 +21,8 @@ rec {
 }
 /* (SYSTEM trivial-garbage DESCRIPTION
     Portable finalizers, weak hash-tables and weak pointers. SHA256
-    1yy1jyx7wz5rr7lr0jyyfxgzfddmrxrmkp46a21pcdc4jlss1h08 URL
-    http://beta.quicklisp.org/archive/trivial-garbage/2015-01-13/trivial-garbage-20150113-git.tgz
-    MD5 59153568703eed631e53092ab67f935e NAME trivial-garbage FILENAME
+    0hiflg8iak99bbgv0lqj6zwqyklx85ixp7yp4r8xzzm61ya613pl URL
+    http://beta.quicklisp.org/archive/trivial-garbage/2018-10-18/trivial-garbage-20181018-git.tgz
+    MD5 4d1d1ab0518b375da21b9a6eeaa498e3 NAME trivial-garbage FILENAME
     trivial-garbage DEPS ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION
-    20150113-git SIBLINGS NIL PARASITES (trivial-garbage-tests)) */
+    20181018-git SIBLINGS NIL PARASITES (trivial-garbage-tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
index edb01bd2fc5..2aee236ac0c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''trivial-gray-streams'';
-  version = ''20180831-git'';
+  version = ''20181018-git'';
 
   description = ''Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams).'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-gray-streams/2018-08-31/trivial-gray-streams-20180831-git.tgz'';
-    sha256 = ''0mh9w8inqxb6lpq787grnf72qlcrjd0a7qs6psjyfs6iazs14170'';
+    url = ''http://beta.quicklisp.org/archive/trivial-gray-streams/2018-10-18/trivial-gray-streams-20181018-git.tgz'';
+    sha256 = ''0a1dmf7m9zbv3p6f5mzb413cy4fz9ahaykqp3ik1a98ivy0i74iv'';
   };
 
   packageName = "trivial-gray-streams";
@@ -19,8 +19,8 @@ rec {
 }
 /* (SYSTEM trivial-gray-streams DESCRIPTION
     Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams).
-    SHA256 0mh9w8inqxb6lpq787grnf72qlcrjd0a7qs6psjyfs6iazs14170 URL
-    http://beta.quicklisp.org/archive/trivial-gray-streams/2018-08-31/trivial-gray-streams-20180831-git.tgz
-    MD5 070733919aa016a508b2ecb443e37c80 NAME trivial-gray-streams FILENAME
-    trivial-gray-streams DEPS NIL DEPENDENCIES NIL VERSION 20180831-git
+    SHA256 0a1dmf7m9zbv3p6f5mzb413cy4fz9ahaykqp3ik1a98ivy0i74iv URL
+    http://beta.quicklisp.org/archive/trivial-gray-streams/2018-10-18/trivial-gray-streams-20181018-git.tgz
+    MD5 0a9f564079dc41ce10d7869d82cc0952 NAME trivial-gray-streams FILENAME
+    trivial-gray-streams DEPS NIL DEPENDENCIES NIL VERSION 20181018-git
     SIBLINGS (trivial-gray-streams-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
index 4214779af32..d34913b1656 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''trivial-indent'';
-  version = ''20180831-git'';
+  version = ''20181018-git'';
 
   description = ''A very simple library to allow indentation hints for SWANK.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-indent/2018-08-31/trivial-indent-20180831-git.tgz'';
-    sha256 = ''017ydjyp9v1bqfhg6yq73q7lf2ds3g7s8i9ng9n7iv2k9ffxm65m'';
+    url = ''http://beta.quicklisp.org/archive/trivial-indent/2018-10-18/trivial-indent-20181018-git.tgz'';
+    sha256 = ''0lrbzm1dsf28q7vh9g8n8i5gzd5lxzfaphsa5dd9k2ahdr912c2g'';
   };
 
   packageName = "trivial-indent";
@@ -19,8 +19,8 @@ rec {
 }
 /* (SYSTEM trivial-indent DESCRIPTION
     A very simple library to allow indentation hints for SWANK. SHA256
-    017ydjyp9v1bqfhg6yq73q7lf2ds3g7s8i9ng9n7iv2k9ffxm65m URL
-    http://beta.quicklisp.org/archive/trivial-indent/2018-08-31/trivial-indent-20180831-git.tgz
-    MD5 0cc411500f5aa677cd771d45f4cd21b8 NAME trivial-indent FILENAME
-    trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20180831-git SIBLINGS NIL
+    0lrbzm1dsf28q7vh9g8n8i5gzd5lxzfaphsa5dd9k2ahdr912c2g URL
+    http://beta.quicklisp.org/archive/trivial-indent/2018-10-18/trivial-indent-20181018-git.tgz
+    MD5 87679f984544027ac939c22e288b09c5 NAME trivial-indent FILENAME
+    trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20181018-git SIBLINGS NIL
     PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
index 4a36b656353..0d8822c2f4f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''woo'';
-  version = ''20180831-git'';
+  version = ''20181210-git'';
 
   description = ''An asynchronous HTTP server written in Common Lisp'';
 
-  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-utilities" args."clack-socket" args."fast-http" args."fast-io" args."flexi-streams" args."lev" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."swap-bytes" args."trivial-features" args."trivial-gray-streams" args."trivial-utf-8" args."uiop" args."vom" args."xsubseq" ];
+  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-utilities" args."clack-socket" args."fast-http" args."fast-io" args."flexi-streams" args."lev" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."swap-bytes" args."trivial-features" args."trivial-gray-streams" args."trivial-utf-8" args."vom" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/woo/2018-08-31/woo-20180831-git.tgz'';
-    sha256 = ''142f3d9bv2zd0l9p1pavf05c2wi4jiz521wji9zyysspmibys3z8'';
+    url = ''http://beta.quicklisp.org/archive/woo/2018-12-10/woo-20181210-git.tgz'';
+    sha256 = ''1j00hvlhc24r3zyxh3bjb3xj74lyrvmbdgsdabidjxlzihmcb4ms'';
   };
 
   packageName = "woo";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM woo DESCRIPTION An asynchronous HTTP server written in Common Lisp
-    SHA256 142f3d9bv2zd0l9p1pavf05c2wi4jiz521wji9zyysspmibys3z8 URL
-    http://beta.quicklisp.org/archive/woo/2018-08-31/woo-20180831-git.tgz MD5
-    93dfbc504ebd4fa7ed5f444fcc5444e7 NAME woo FILENAME woo DEPS
+    SHA256 1j00hvlhc24r3zyxh3bjb3xj74lyrvmbdgsdabidjxlzihmcb4ms URL
+    http://beta.quicklisp.org/archive/woo/2018-12-10/woo-20181210-git.tgz MD5
+    ecc4d7c194b3a941e381d9e6392d51c9 NAME woo FILENAME woo DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
@@ -36,11 +36,11 @@ rec {
      (NAME swap-bytes FILENAME swap-bytes)
      (NAME trivial-features FILENAME trivial-features)
      (NAME trivial-gray-streams FILENAME trivial-gray-streams)
-     (NAME trivial-utf-8 FILENAME trivial-utf-8) (NAME uiop FILENAME uiop)
-     (NAME vom FILENAME vom) (NAME xsubseq FILENAME xsubseq))
+     (NAME trivial-utf-8 FILENAME trivial-utf-8) (NAME vom FILENAME vom)
+     (NAME xsubseq FILENAME xsubseq))
     DEPENDENCIES
     (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain
      cl-utilities clack-socket fast-http fast-io flexi-streams lev proc-parse
      quri smart-buffer split-sequence static-vectors swap-bytes
-     trivial-features trivial-gray-streams trivial-utf-8 uiop vom xsubseq)
-    VERSION 20180831-git SIBLINGS (clack-handler-woo woo-test) PARASITES NIL) */
+     trivial-features trivial-gray-streams trivial-utf-8 vom xsubseq)
+    VERSION 20181210-git SIBLINGS (clack-handler-woo woo-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
index 6db21bf9005..f717441068b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''wookie'';
-  version = ''20180831-git'';
+  version = ''20181018-git'';
 
   description = ''An evented webserver for Common Lisp.'';
 
-  deps = [ args."alexandria" args."babel" args."babel-streams" args."blackbird" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chunga" args."cl-async" args."cl-async-base" args."cl-async-ssl" args."cl-async-util" args."cl-fad" args."cl-libuv" args."cl-ppcre" args."cl-utilities" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" args."xsubseq" ];
+  deps = [ args."alexandria" args."babel" args."blackbird" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chunga" args."cl-async" args."cl-async-base" args."cl-async-ssl" args."cl-async-util" args."cl-fad" args."cl-libuv" args."cl-ppcre" args."cl-utilities" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/wookie/2018-08-31/wookie-20180831-git.tgz'';
-    sha256 = ''1hy6hdfhdfnyd00q3v7ryjqvq7x8j22yy4l52p24jj0n19mx3pjx'';
+    url = ''http://beta.quicklisp.org/archive/wookie/2018-10-18/wookie-20181018-git.tgz'';
+    sha256 = ''0z7v7fg9dm6g4kdvfi588vnfh0dv2knb0z3rf5a9fw8yrvckifdq'';
   };
 
   packageName = "wookie";
@@ -18,11 +18,10 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM wookie DESCRIPTION An evented webserver for Common Lisp. SHA256
-    1hy6hdfhdfnyd00q3v7ryjqvq7x8j22yy4l52p24jj0n19mx3pjx URL
-    http://beta.quicklisp.org/archive/wookie/2018-08-31/wookie-20180831-git.tgz
-    MD5 c825760241580a95c68b1ac6f428e07e NAME wookie FILENAME wookie DEPS
+    0z7v7fg9dm6g4kdvfi588vnfh0dv2knb0z3rf5a9fw8yrvckifdq URL
+    http://beta.quicklisp.org/archive/wookie/2018-10-18/wookie-20181018-git.tgz
+    MD5 91e350e5aca3c3a5c56371bff8f754ae NAME wookie FILENAME wookie DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
-     (NAME babel-streams FILENAME babel-streams)
      (NAME blackbird FILENAME blackbird)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
@@ -44,9 +43,9 @@ rec {
      (NAME trivial-gray-streams FILENAME trivial-gray-streams)
      (NAME vom FILENAME vom) (NAME xsubseq FILENAME xsubseq))
     DEPENDENCIES
-    (alexandria babel babel-streams blackbird bordeaux-threads cffi cffi-grovel
+    (alexandria babel blackbird bordeaux-threads cffi cffi-grovel
      cffi-toolchain chunga cl-async cl-async-base cl-async-ssl cl-async-util
      cl-fad cl-libuv cl-ppcre cl-utilities do-urlencode fast-http fast-io
      flexi-streams proc-parse quri smart-buffer split-sequence static-vectors
      trivial-features trivial-gray-streams vom xsubseq)
-    VERSION 20180831-git SIBLINGS NIL PARASITES NIL) */
+    VERSION 20181018-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix
index 63b8e21b4a3..ad90b855218 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix
@@ -1,15 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''xpath'';
-  version = ''plexippus-20120909-darcs'';
+  version = ''plexippus-20181210-git'';
 
-  description = '''';
+  parasites = [ "xpath/test" ];
 
-  deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."parse-number" args."puri" args."trivial-features" args."trivial-gray-streams" args."yacc" ];
+  description = ''An implementation of the XML Path Language (XPath) Version 1.0'';
+
+  deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."parse-number" args."puri" args."trivial-features" args."trivial-gray-streams" args."yacc" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/plexippus-xpath/2012-09-09/plexippus-xpath-20120909-darcs.tgz'';
-    sha256 = ''1zlkr7ck60gr5rxfiq22prnbblih14ywr0s5g2kss2a842zvkxn6'';
+    url = ''http://beta.quicklisp.org/archive/plexippus-xpath/2018-12-10/plexippus-xpath-20181210-git.tgz'';
+    sha256 = ''1acg17ckl65h0xr1vv2ljkmli7jgln7qhl4zs8lwl9jcayi6fynn'';
   };
 
   packageName = "xpath";
@@ -17,21 +19,19 @@ rec {
   asdFilesToKeep = ["xpath.asd"];
   overrides = x: x;
 }
-/* (SYSTEM xpath DESCRIPTION NIL SHA256
-    1zlkr7ck60gr5rxfiq22prnbblih14ywr0s5g2kss2a842zvkxn6 URL
-    http://beta.quicklisp.org/archive/plexippus-xpath/2012-09-09/plexippus-xpath-20120909-darcs.tgz
-    MD5 1d7457bffe7c4f6e1631c59bc00723d4 NAME xpath FILENAME xpath DEPS
+/* (SYSTEM xpath DESCRIPTION
+    An implementation of the XML Path Language (XPath) Version 1.0 SHA256
+    1acg17ckl65h0xr1vv2ljkmli7jgln7qhl4zs8lwl9jcayi6fynn URL
+    http://beta.quicklisp.org/archive/plexippus-xpath/2018-12-10/plexippus-xpath-20181210-git.tgz
+    MD5 106060a6e90dd35c80385ad5a1e8554d NAME xpath FILENAME xpath DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME cl-ppcre FILENAME cl-ppcre)
      (NAME closure-common FILENAME closure-common) (NAME cxml FILENAME cxml)
-     (NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks)
-     (NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml)
      (NAME parse-number FILENAME parse-number) (NAME puri FILENAME puri)
      (NAME trivial-features FILENAME trivial-features)
      (NAME trivial-gray-streams FILENAME trivial-gray-streams)
      (NAME yacc FILENAME yacc))
     DEPENDENCIES
-    (alexandria babel cl-ppcre closure-common cxml cxml-dom cxml-klacks
-     cxml-test cxml-xml parse-number puri trivial-features trivial-gray-streams
-     yacc)
-    VERSION plexippus-20120909-darcs SIBLINGS NIL PARASITES NIL) */
+    (alexandria babel cl-ppcre closure-common cxml parse-number puri
+     trivial-features trivial-gray-streams yacc)
+    VERSION plexippus-20181210-git SIBLINGS NIL PARASITES (xpath/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
index e904f0041d1..df370082782 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
@@ -6,6 +6,12 @@ let quicklisp-to-nix-packages = rec {
   buildLispPackage = callPackage ./define-package.nix;
   qlOverrides = callPackage ./quicklisp-to-nix-overrides.nix {};
 
+  "simple-date_slash_postgres-glue" = quicklisp-to-nix-packages."simple-date";
+
+
+  "xpath_slash_test" = quicklisp-to-nix-packages."xpath";
+
+
   "unit-test" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."unit-test" or (x: {}))
@@ -123,6 +129,7 @@ let quicklisp-to-nix-packages = rec {
          inherit fetchurl;
            "fiveam" = quicklisp-to-nix-packages."fiveam";
            "md5" = quicklisp-to-nix-packages."md5";
+           "simple-date_slash_postgres-glue" = quicklisp-to-nix-packages."simple-date_slash_postgres-glue";
            "split-sequence" = quicklisp-to-nix-packages."split-sequence";
            "usocket" = quicklisp-to-nix-packages."usocket";
        }));
@@ -138,10 +145,6 @@ let quicklisp-to-nix-packages = rec {
            "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
            "closure-common" = quicklisp-to-nix-packages."closure-common";
            "cxml" = quicklisp-to-nix-packages."cxml";
-           "cxml-dom" = quicklisp-to-nix-packages."cxml-dom";
-           "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks";
-           "cxml-test" = quicklisp-to-nix-packages."cxml-test";
-           "cxml-xml" = quicklisp-to-nix-packages."cxml-xml";
            "parse-number" = quicklisp-to-nix-packages."parse-number";
            "puri" = quicklisp-to-nix-packages."puri";
            "trivial-features" = quicklisp-to-nix-packages."trivial-features";
@@ -160,16 +163,13 @@ let quicklisp-to-nix-packages = rec {
            "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
            "closure-common" = quicklisp-to-nix-packages."closure-common";
            "cxml" = quicklisp-to-nix-packages."cxml";
-           "cxml-dom" = quicklisp-to-nix-packages."cxml-dom";
-           "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks";
-           "cxml-test" = quicklisp-to-nix-packages."cxml-test";
-           "cxml-xml" = quicklisp-to-nix-packages."cxml-xml";
            "parse-number" = quicklisp-to-nix-packages."parse-number";
            "puri" = quicklisp-to-nix-packages."puri";
            "rt" = quicklisp-to-nix-packages."rt";
            "trivial-features" = quicklisp-to-nix-packages."trivial-features";
            "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
            "xpath" = quicklisp-to-nix-packages."xpath";
+           "xpath_slash_test" = quicklisp-to-nix-packages."xpath_slash_test";
            "yacc" = quicklisp-to-nix-packages."yacc";
        }));
 
@@ -229,10 +229,6 @@ let quicklisp-to-nix-packages = rec {
            "closure-html" = quicklisp-to-nix-packages."closure-html";
            "collectors" = quicklisp-to-nix-packages."collectors";
            "cxml" = quicklisp-to-nix-packages."cxml";
-           "cxml-dom" = quicklisp-to-nix-packages."cxml-dom";
-           "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks";
-           "cxml-test" = quicklisp-to-nix-packages."cxml-test";
-           "cxml-xml" = quicklisp-to-nix-packages."cxml-xml";
            "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
            "iterate" = quicklisp-to-nix-packages."iterate";
            "named-readtables" = quicklisp-to-nix-packages."named-readtables";
@@ -261,10 +257,6 @@ let quicklisp-to-nix-packages = rec {
            "closure-html" = quicklisp-to-nix-packages."closure-html";
            "collectors" = quicklisp-to-nix-packages."collectors";
            "cxml" = quicklisp-to-nix-packages."cxml";
-           "cxml-dom" = quicklisp-to-nix-packages."cxml-dom";
-           "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks";
-           "cxml-test" = quicklisp-to-nix-packages."cxml-test";
-           "cxml-xml" = quicklisp-to-nix-packages."cxml-xml";
            "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
            "iterate" = quicklisp-to-nix-packages."iterate";
            "lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2";
@@ -303,6 +295,7 @@ let quicklisp-to-nix-packages = rec {
        (import ./quicklisp-to-nix-output/fiasco.nix {
          inherit fetchurl;
            "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
        }));
 
 
@@ -394,18 +387,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "cxml-xml" = quicklisp-to-nix-packages."cxml";
-
-
-  "cxml-test" = quicklisp-to-nix-packages."cxml";
-
-
-  "cxml-klacks" = quicklisp-to-nix-packages."cxml";
-
-
-  "cxml-dom" = quicklisp-to-nix-packages."cxml";
-
-
   "closure-common" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."closure-common" or (x: {}))
@@ -647,9 +628,7 @@ let quicklisp-to-nix-packages = rec {
          inherit fetchurl;
            "alexandria" = quicklisp-to-nix-packages."alexandria";
            "babel" = quicklisp-to-nix-packages."babel";
-           "babel-streams" = quicklisp-to-nix-packages."babel-streams";
            "trivial-features" = quicklisp-to-nix-packages."trivial-features";
-           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
        }));
 
 
@@ -825,18 +804,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "babel-streams" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."babel-streams" or (x: {}))
-       (import ./quicklisp-to-nix-output/babel-streams.nix {
-         inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "babel" = quicklisp-to-nix-packages."babel";
-           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
-           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
-       }));
-
-
   "anaphora" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."anaphora" or (x: {}))
@@ -907,7 +874,6 @@ let quicklisp-to-nix-packages = rec {
          inherit fetchurl;
            "alexandria" = quicklisp-to-nix-packages."alexandria";
            "babel" = quicklisp-to-nix-packages."babel";
-           "babel-streams" = quicklisp-to-nix-packages."babel-streams";
            "blackbird" = quicklisp-to-nix-packages."blackbird";
            "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
            "cffi" = quicklisp-to-nix-packages."cffi";
@@ -964,7 +930,6 @@ let quicklisp-to-nix-packages = rec {
            "trivial-features" = quicklisp-to-nix-packages."trivial-features";
            "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
            "trivial-utf-8" = quicklisp-to-nix-packages."trivial-utf-8";
-           "uiop" = quicklisp-to-nix-packages."uiop";
            "vom" = quicklisp-to-nix-packages."vom";
            "xsubseq" = quicklisp-to-nix-packages."xsubseq";
        }));
@@ -1090,6 +1055,7 @@ let quicklisp-to-nix-packages = rec {
        (import ./quicklisp-to-nix-output/simple-date.nix {
          inherit fetchurl;
            "cl-postgres" = quicklisp-to-nix-packages."cl-postgres";
+           "fiveam" = quicklisp-to-nix-packages."fiveam";
            "md5" = quicklisp-to-nix-packages."md5";
            "usocket" = quicklisp-to-nix-packages."usocket";
        }));
@@ -1718,11 +1684,7 @@ let quicklisp-to-nix-packages = rec {
            "collectors" = quicklisp-to-nix-packages."collectors";
            "css-selectors" = quicklisp-to-nix-packages."css-selectors";
            "cxml" = quicklisp-to-nix-packages."cxml";
-           "cxml-dom" = quicklisp-to-nix-packages."cxml-dom";
-           "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks";
            "cxml-stp" = quicklisp-to-nix-packages."cxml-stp";
-           "cxml-test" = quicklisp-to-nix-packages."cxml-test";
-           "cxml-xml" = quicklisp-to-nix-packages."cxml-xml";
            "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
            "iterate" = quicklisp-to-nix-packages."iterate";
            "named-readtables" = quicklisp-to-nix-packages."named-readtables";
@@ -1756,10 +1718,6 @@ let quicklisp-to-nix-packages = rec {
            "collectors" = quicklisp-to-nix-packages."collectors";
            "css-selectors" = quicklisp-to-nix-packages."css-selectors";
            "cxml" = quicklisp-to-nix-packages."cxml";
-           "cxml-dom" = quicklisp-to-nix-packages."cxml-dom";
-           "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks";
-           "cxml-test" = quicklisp-to-nix-packages."cxml-test";
-           "cxml-xml" = quicklisp-to-nix-packages."cxml-xml";
            "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
            "iterate" = quicklisp-to-nix-packages."iterate";
            "named-readtables" = quicklisp-to-nix-packages."named-readtables";
@@ -1791,10 +1749,6 @@ let quicklisp-to-nix-packages = rec {
            "closure-html" = quicklisp-to-nix-packages."closure-html";
            "collectors" = quicklisp-to-nix-packages."collectors";
            "cxml" = quicklisp-to-nix-packages."cxml";
-           "cxml-dom" = quicklisp-to-nix-packages."cxml-dom";
-           "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks";
-           "cxml-test" = quicklisp-to-nix-packages."cxml-test";
-           "cxml-xml" = quicklisp-to-nix-packages."cxml-xml";
            "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
            "iterate" = quicklisp-to-nix-packages."iterate";
            "lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2";
@@ -2187,10 +2141,6 @@ let quicklisp-to-nix-packages = rec {
            "closer-mop" = quicklisp-to-nix-packages."closer-mop";
            "closure-common" = quicklisp-to-nix-packages."closure-common";
            "cxml" = quicklisp-to-nix-packages."cxml";
-           "cxml-dom" = quicklisp-to-nix-packages."cxml-dom";
-           "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks";
-           "cxml-test" = quicklisp-to-nix-packages."cxml-test";
-           "cxml-xml" = quicklisp-to-nix-packages."cxml-xml";
            "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
            "hu_dot_dwim_dot_stefil" = quicklisp-to-nix-packages."hu_dot_dwim_dot_stefil";
            "iterate" = quicklisp-to-nix-packages."iterate";
@@ -2604,7 +2554,6 @@ let quicklisp-to-nix-packages = rec {
            "alexandria" = quicklisp-to-nix-packages."alexandria";
            "anaphora" = quicklisp-to-nix-packages."anaphora";
            "babel" = quicklisp-to-nix-packages."babel";
-           "babel-streams" = quicklisp-to-nix-packages."babel-streams";
            "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
            "cffi" = quicklisp-to-nix-packages."cffi";
            "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
diff --git a/pkgs/development/lua-modules/default.nix b/pkgs/development/lua-modules/default.nix
new file mode 100644
index 00000000000..c20d4d02c65
--- /dev/null
+++ b/pkgs/development/lua-modules/default.nix
@@ -0,0 +1,17 @@
+# inspired by pkgs/development/haskell-modules/default.nix
+{ pkgs, stdenv, lib
+, lua
+, overrides ? (self: super: {})
+}:
+
+let
+
+  inherit (lib) extends makeExtensible;
+
+  initialPackages = (pkgs.callPackage ../../top-level/lua-packages.nix {
+    inherit lua;
+  });
+
+  extensible-self = makeExtensible initialPackages;
+in
+  extensible-self
diff --git a/pkgs/development/lua-modules/generic/default.nix b/pkgs/development/lua-modules/generic/default.nix
index 5669eae96c5..3dae32b5e15 100644
--- a/pkgs/development/lua-modules/generic/default.nix
+++ b/pkgs/development/lua-modules/generic/default.nix
@@ -1,11 +1,11 @@
-{ lua, writeText }:
+{ lua, writeText, toLuaModule }:
 
 { buildInputs ? [], disabled ? false, ... } @ attrs:
 
 if disabled then
   throw "${attrs.name} not supported by interpreter lua-${lua.luaversion}"
 else
-  lua.stdenv.mkDerivation (
+  toLuaModule( lua.stdenv.mkDerivation (
     {
       makeFlags = [
         "PREFIX=$(out)"
@@ -51,4 +51,4 @@ else
         addEnvHooks "$hostOffset" addLuaLibCPath
       '';
     }
-  )
+  ) )
diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix
index 690f9712a10..935a4a4f2fb 100644
--- a/pkgs/development/mobile/androidenv/compose-android-packages.nix
+++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix
@@ -20,20 +20,13 @@
 , includeExtras ? []
 }:
 
-if !licenseAccepted then throw ''
-    You must accept the Android Software Development Kit License Agreement at
-    https://developer.android.com/studio/terms
-    by setting nixpkgs config option 'android_sdk.accept_license = true;'
-  ''
-else assert licenseAccepted;
-
 let
   inherit (pkgs) stdenv fetchurl makeWrapper unzip;
 
   # Determine the Android os identifier from Nix's system identifier
   os = if stdenv.system == "x86_64-linux" then "linux"
     else if stdenv.system == "x86_64-darwin" then "macosx"
-    else "No tarballs found for system architecture: ${stdenv.system}";
+    else throw "No tarballs found for system architecture: ${stdenv.system}";
 
   # Generated Nix packages
   packages = import ./generated/packages.nix {
@@ -196,7 +189,11 @@ rec {
   # This derivation deploys the tools package and symlinks all the desired
   # plugins that we want to use.
 
-  androidsdk = import ./tools.nix {
+  androidsdk = if !licenseAccepted then throw ''
+    You must accept the Android Software Development Kit License Agreement at
+    https://developer.android.com/studio/terms
+    by setting nixpkgs config option 'android_sdk.accept_license = true;'
+  '' else import ./tools.nix {
     inherit deployAndroidPackage requireFile packages toolsVersion autoPatchelfHook makeWrapper os pkgs pkgs_i686;
     inherit (stdenv) lib;
 
diff --git a/pkgs/development/python-modules/Wand/default.nix b/pkgs/development/python-modules/Wand/default.nix
index 8108914814a..a884b9eb7fb 100644
--- a/pkgs/development/python-modules/Wand/default.nix
+++ b/pkgs/development/python-modules/Wand/default.nix
@@ -1,46 +1,33 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
-, imagemagick
-, pytest
-, psutil
-, memory_profiler
-, pytest_xdist
+, imagemagick7Big
 }:
 
-let
-  soext = stdenv.hostPlatform.extensions.sharedLibrary;
-  magick_wand_library = "${imagemagick}/lib/libMagickWand-6.Q16${soext}";
-  imagemagick_library = "${imagemagick}/lib/libMagickCore-6.Q16${soext}";
-in buildPythonPackage rec {
+buildPythonPackage rec {
   pname = "Wand";
-  version = "0.4.5";
+  version = "0.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b40a2215545e8c7193b3fccd6e7251dc556ec9b878a4f67d992b056ff396bc65";
+    sha256 = "0rp1zdp2p7qngva5amcw4jb5i8gf569v8469gf6zj36hcnzksxjj";
   };
 
-  checkInputs = [ pytest pytest_xdist memory_profiler psutil ];
-
-  buildInputs = [ imagemagick ];
-
-  inherit magick_wand_library imagemagick_library;
-
   postPatch = ''
-    substituteAllInPlace wand/api.py
+    substituteInPlace wand/api.py --replace \
+      "magick_home = os.environ.get('MAGICK_HOME')" \
+      "magick_home = '${imagemagick7Big}'"
   '';
 
   # tests not included with pypi release
   doCheck = false;
 
+  passthru.imagemagick = imagemagick7Big;
+
   meta = with stdenv.lib; {
     description = "Ctypes-based simple MagickWand API binding for Python";
     homepage = http://wand-py.org/;
     license = [ licenses.mit ];
-  };
-
-  passthru = {
-    inherit imagemagick;
+    maintainers = with maintainers; [ infinisil ];
   };
 }
diff --git a/pkgs/development/python-modules/androguard/default.nix b/pkgs/development/python-modules/androguard/default.nix
new file mode 100644
index 00000000000..686d6a2a75e
--- /dev/null
+++ b/pkgs/development/python-modules/androguard/default.nix
@@ -0,0 +1,37 @@
+{ lib, buildPythonPackage, fetchPypi, future, networkx, pygments, lxml, colorama, matplotlib,
+  asn1crypto, click, pydot, ipython, pyqt5, pyperclip }:
+
+buildPythonPackage rec {
+  version = "3.3.3";
+  pname = "androguard";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1zlmn3byh2whg7k2xmcd7yy43lcawhryjnzcxr9bhn54709b6iyd";
+  };
+
+  propagatedBuildInputs = [
+    future
+    networkx
+    pygments
+    lxml
+    colorama
+    matplotlib
+    asn1crypto
+    click
+    pydot
+    ipython
+    pyqt5
+    pyperclip
+  ];
+
+  # Tests are not shipped on PyPI.
+  doCheck = false;
+
+  meta = {
+    description = "Tool and python library to interact with Android Files";
+    homepage = https://github.com/androguard/androguard;
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.pmiddend ];
+  };
+}
diff --git a/pkgs/development/python-modules/astral/default.nix b/pkgs/development/python-modules/astral/default.nix
index 577a92eb891..3c5839267bd 100644
--- a/pkgs/development/python-modules/astral/default.nix
+++ b/pkgs/development/python-modules/astral/default.nix
@@ -2,18 +2,18 @@
 
 buildPythonPackage rec {
   pname = "astral";
-  version = "1.7.1";
+  version = "1.9.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "01raz1c29v08f05l395v1hxllad35m5ld1jj51knb53c0396y248";
+    sha256 = "179f72a086cee96487e60514bab81e821966953fc2e2f7091500d3d2c314e38b";
   };
 
   propagatedBuildInputs = [ pytz requests ];
 
   checkInputs = [ pytest ];
   checkPhase = ''
-    # https://github.com/sffjunkie/astral/pull/13
+    # https://github.com/sffjunkie/astral/pull/26
     touch src/test/.api_key
     py.test -m "not webtest"
   '';
diff --git a/pkgs/development/python-modules/django-sesame/default.nix b/pkgs/development/python-modules/django-sesame/default.nix
new file mode 100644
index 00000000000..9887580b0fd
--- /dev/null
+++ b/pkgs/development/python-modules/django-sesame/default.nix
@@ -0,0 +1,27 @@
+{ lib, buildPythonPackage, fetchPypi
+, django }:
+
+buildPythonPackage rec {
+  pname = "django-sesame";
+  version = "1.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "081q3vd9waiajiipg99flw0vlzk920sz07067v3n5774gx0qhbaa";
+  };
+
+  checkInputs = [ django ];
+
+  checkPhase = ''
+    PYTHONPATH="$(pwd):$PYTHONPATH" \
+    DJANGO_SETTINGS_MODULE=sesame.test_settings \
+      django-admin test sesame
+  '';
+
+  meta = with lib; {
+    description = "URLs with authentication tokens for automatic login";
+    homepage = http://github.com/aaugustin/django-sesame;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ elohmeier ];
+  };
+}
diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix
index 131c6b3ef1b..6e2bbd9fd5d 100644
--- a/pkgs/development/python-modules/django/1_11.nix
+++ b/pkgs/development/python-modules/django/1_11.nix
@@ -6,13 +6,11 @@
 
 buildPythonPackage rec {
   pname = "Django";
-  version = "1.11.17";
-
-  disabled = pythonOlder "2.7";
+  version = "1.11.18";
 
   src = fetchurl {
     url = "https://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz";
-    sha256 = "10xlpm21ll8mgz5py41sz9vrd603qv7an736agbqxkxlyikfx1x7";
+    sha256 = "19b6f020als9hr4q1im5282yn2b1hzf586n9kjrlkrslq7da3k3k";
   };
 
   patches = stdenv.lib.optionals withGdal [
diff --git a/pkgs/development/python-modules/django/1_8.nix b/pkgs/development/python-modules/django/1_8.nix
index 30d75e73c68..ee2408f7340 100644
--- a/pkgs/development/python-modules/django/1_8.nix
+++ b/pkgs/development/python-modules/django/1_8.nix
@@ -25,6 +25,11 @@ buildPythonPackage rec {
     description = "A high-level Python Web framework";
     homepage = https://www.djangoproject.com/;
     license = licenses.bsd0;
+    knownVulnerabilities = [
+      # The patches were not backported due to Django 1.8 having reached EOL
+      https://www.djangoproject.com/weblog/2018/aug/01/security-releases/
+      https://www.djangoproject.com/weblog/2019/jan/04/security-releases/
+    ];
   };
 
 }
diff --git a/pkgs/development/python-modules/docker-py/default.nix b/pkgs/development/python-modules/docker-py/default.nix
new file mode 100644
index 00000000000..84dba75e404
--- /dev/null
+++ b/pkgs/development/python-modules/docker-py/default.nix
@@ -0,0 +1,28 @@
+{ lib, buildPythonPackage, fetchPypi, six, requests, websocket_client, docker_pycreds }:
+
+buildPythonPackage rec {
+  version = "1.10.6";
+  pname = "docker-py";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "05f49f6hnl7npmi7kigg0ibqk8s3fhzx1ivvz1kqvlv4ay3paajc";
+  };
+
+  # The tests access the network.
+  doCheck = false;
+
+  propagatedBuildInputs = [
+    six
+    requests
+    websocket_client
+    docker_pycreds
+  ];
+
+  meta = {
+    description = "Python library for the Docker Remote API";
+    homepage = https://github.com/docker/docker-py/;
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.pmiddend ];
+  };
+}
diff --git a/pkgs/development/python-modules/eradicate/default.nix b/pkgs/development/python-modules/eradicate/default.nix
index 7c071a5cee6..6b3909a5b45 100644
--- a/pkgs/development/python-modules/eradicate/default.nix
+++ b/pkgs/development/python-modules/eradicate/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "eradicate";
-  version = "0.2.1";
+  version = "1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "092zmck919bn6sl31ixrzhn88g9nvhwzmwzpq8dzgn6c8k2h3bzr";
+    sha256 = "06nhs8wml5f5k96gbq7jl417bmsqnxy8aykpzbzrvm3gmqmaizag";
   };
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/favicon/default.nix b/pkgs/development/python-modules/favicon/default.nix
new file mode 100644
index 00000000000..e4675274c09
--- /dev/null
+++ b/pkgs/development/python-modules/favicon/default.nix
@@ -0,0 +1,27 @@
+{ lib, buildPythonPackage, fetchPypi, requests, beautifulsoup4, pytest, requests-mock,
+  pytestrunner }:
+
+buildPythonPackage rec {
+  pname = "favicon";
+  version = "0.5.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "01jhb66nrqbf22z6ybpi8ndw6zifgysdmnh547027g96nz51669y";
+  };
+
+  buildInputs = [ pytestrunner ];
+  checkInputs = [ pytest requests-mock ];
+  propagatedBuildInputs = [ requests beautifulsoup4 ];
+
+  checkPhase = ''
+    pytest
+  '';
+
+  meta = with lib; {
+    description = "Find a website's favicon";
+    homepage = http://github.com/scottwernervt/favicon;
+    license = licenses.mit;
+    maintainers = with maintainers; [ elohmeier ];
+  };
+}
diff --git a/pkgs/development/python-modules/fdroidserver/default.nix b/pkgs/development/python-modules/fdroidserver/default.nix
deleted file mode 100644
index b9b936ae83e..00000000000
--- a/pkgs/development/python-modules/fdroidserver/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchFromGitLab
-, libcloud
-, pyyaml
-, paramiko
-, pyasn1
-, pyasn1-modules
-, pillow
-, mwclient
-, GitPython
-, isPy3k
-}:
-
-buildPythonPackage rec {
-  version = "2016-05-31";
-  pname = "fdroidserver-git";
-  disabled = ! isPy3k;
-
-  src = fetchFromGitLab {
-    owner = "fdroid";
-    repo = "fdroidserver";
-    rev = "401649e0365e6e365fc48ae8a3af94768af865f3";
-    sha256 = "1mmi2ffpym1qw694yj938kc7b4xhq0blri7wkjaqddcyykjyr94d";
-  };
-
-  propagatedBuildInputs = [ libcloud pyyaml paramiko pyasn1 pyasn1-modules pillow mwclient GitPython ];
-
-  meta = with stdenv.lib; {
-    homepage = https://f-droid.org;
-    description = "Server and tools for F-Droid, the Free Software repository system for Android";
-    license = licenses.agpl3;
-  };
-
-}
diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix
index 4fd2db014ba..58df04c17c8 100644
--- a/pkgs/development/python-modules/fonttools/default.nix
+++ b/pkgs/development/python-modules/fonttools/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "fonttools";
-  version = "3.34.2";
+  version = "3.37.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1ahs82jnc8f7gksh51asg9dcifhslyfdz9dry9sxq424q1p5k9lz";
+    sha256 = "1bf7k6qdvi2ycw87g8iqy0rwl3ms25k3zz6ix1fpsk8qx36gk9x1";
     extension = "zip";
   };
 
diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix
index 38457caabbf..f6fa41e33f8 100644
--- a/pkgs/development/python-modules/ftfy/default.nix
+++ b/pkgs/development/python-modules/ftfy/default.nix
@@ -4,13 +4,13 @@
 , fetchPypi
 , html5lib
 , wcwidth
-, nose
+, pytest
 }:
 
 buildPythonPackage rec {
   pname = "ftfy";
 
-  version = "5.5.0";
+  version = "5.5.1";
   # ftfy v5 only supports python3. Since at the moment the only
   # packages that use ftfy are spacy and textacy which both support
   # python 2 and 3, they have pinned ftfy to the v4 branch.
@@ -20,26 +20,26 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "525ea45a871f52ddb170e66b01f35f1b3022995016c81efa305e628937b85443";
+    sha256 = "1ci6xrj4g01a97nymxpv9nj820nlmgzc4ybaz9k46i6bnxzpax7s";
   };
 
-  propagatedBuildInputs = [ html5lib wcwidth ];
+  propagatedBuildInputs = [
+    html5lib
+    wcwidth
+  ];
 
   checkInputs = [
-    nose
+    pytest
   ];
 
+  # We suffix PATH like this because the tests want the ftfy executable
   checkPhase = ''
-    nosetests -v tests
+    PATH=$out/bin:$PATH pytest
   '';
 
-  # Several tests fail with
-  # FileNotFoundError: [Errno 2] No such file or directory: 'ftfy'
-  doCheck = false;
-
   meta = with stdenv.lib; {
-    description = "Given Unicode text, make its representation consistent and possibly less broken.";
-    homepage = https://github.com/LuminosoInsight/python-ftfy/tree/master/tests;
+    description = "Given Unicode text, make its representation consistent and possibly less broken";
+    homepage = https://github.com/LuminosoInsight/python-ftfy;
     license = licenses.mit;
     maintainers = with maintainers; [ sdll aborsu ];
   };
diff --git a/pkgs/development/python-modules/future-fstrings/default.nix b/pkgs/development/python-modules/future-fstrings/default.nix
new file mode 100644
index 00000000000..7df148df09c
--- /dev/null
+++ b/pkgs/development/python-modules/future-fstrings/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildPythonPackage, fetchPypi, pythonOlder }:
+
+buildPythonPackage rec {
+  pname = "future-fstrings";
+  version = "0.4.5";
+
+  src = fetchPypi {
+    inherit version;
+    pname = "future_fstrings";
+    sha256 = "891c5d5f073b3e3ff686bebde0a4c45c479065f45c8cbd6de19323d5a50738a8";
+  };
+
+  # No tests included in Pypi archive
+  doCheck = false;
+
+  meta = with lib; {
+    homepage = https://github.com/asottile/future-fstrings;
+    description = "A backport of fstrings to python<3.6";
+    license = licenses.mit;
+    maintainers = with maintainers; [ nyanloutre ];
+  };
+}
diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix
index 1a335ad6bb1..89c7c6b8df8 100644
--- a/pkgs/development/python-modules/google-api-python-client/default.nix
+++ b/pkgs/development/python-modules/google-api-python-client/default.nix
@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "google-api-python-client";
-  version = "1.7.7";
+  version = "1.7.8";
   #disabled = !isPy3k; # TODO: Python 2.7 was deprecated but weboob still depends on it.
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1nlsp8cll6v9w4649j98xw545bfnqa2xs7m9faa9mxc0kp8ff1li";
+    sha256 = "0n18frf0ghmwf5lxmkyski4b5h1rsx93ibq3iw0k3s2wxl371406";
   };
 
   # No tests included in archive
@@ -20,5 +20,6 @@ buildPythonPackage rec {
     description = "The core Python library for accessing Google APIs";
     homepage = https://github.com/google/google-api-python-client;
     license = licenses.asl20;
+    maintainers = with maintainers; [ primeos ];
   };
 }
diff --git a/pkgs/development/tools/profiling/gprof2dot/default.nix b/pkgs/development/python-modules/gprof2dot/default.nix
index 2f0b03ab7e3..ed48842496c 100644
--- a/pkgs/development/tools/profiling/gprof2dot/default.nix
+++ b/pkgs/development/python-modules/gprof2dot/default.nix
@@ -1,19 +1,20 @@
-{ stdenv, fetchFromGitHub, pythonPackages }:
+{ lib, fetchFromGitHub, buildPythonApplication }:
 
-pythonPackages.buildPythonApplication {
-  name = "gprof2dot-2015-04-27";
+buildPythonApplication {
+  name = "gprof2dot-2017-09-19";
 
   src = fetchFromGitHub {
     owner = "jrfonseca";
     repo = "gprof2dot";
-    rev = "6fbb81559609c12e7c64ae5dce7d102a414a7514";
-    sha256 = "1fff7w6dm6lld11hp2ij97f85ma1154h62dvchq19c5jja3zjw3c";
+    rev = "2017.09.19";
+    sha256 = "1b5wvjv5ykbhz7aix7l3y7mg1hxi0vgak4a49gr92sdlz8blj51v";
   };
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = https://github.com/jrfonseca/gprof2dot;
     description = "Python script to convert the output from many profilers into a dot graph";
     license = licenses.lgpl3Plus;
     platforms = platforms.linux;
+    maintainers = [ maintainers.pmiddend ];
   };
 }
diff --git a/pkgs/development/python-modules/httpsig/default.nix b/pkgs/development/python-modules/httpsig/default.nix
index cff72de3607..24ba9be1382 100644
--- a/pkgs/development/python-modules/httpsig/default.nix
+++ b/pkgs/development/python-modules/httpsig/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "httpsig";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "19ng7y7blp13z081z5a6dxng1p8xlih7g6frmsg3q5ri8lvpybc7";
+    sha256 = "1rkc3zwsq53rjsmc47335m4viljiwdbmw3y2zry4z70j8q1dbmki";
   };
 
   buildInputs = [ setuptools_scm ];
diff --git a/pkgs/development/python-modules/immutables/default.nix b/pkgs/development/python-modules/immutables/default.nix
index 64fc707b8fd..5662f8896cc 100644
--- a/pkgs/development/python-modules/immutables/default.nix
+++ b/pkgs/development/python-modules/immutables/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "immutables";
-  version = "0.6";
+  version = "0.9";
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "63023fa0cceedc62e0d1535cd4ca7a1f6df3120a6d8e5c34e89037402a6fd809";
+    sha256 = "1h7i00x6sdbw62rdipp0kaw1mcrvfipxv0054x1n2r4q4j11q7fp";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/latexcodec/default.nix b/pkgs/development/python-modules/latexcodec/default.nix
index 3b639ee2afb..785d9f1aa3a 100644
--- a/pkgs/development/python-modules/latexcodec/default.nix
+++ b/pkgs/development/python-modules/latexcodec/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "latexcodec";
-  version = "1.0.5";
+  version = "1.0.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0zdd1gf24i83ykadx0y30n3001j43scqr2saql3vckk5c39dj1wn";
+    sha256 = "0s4wdbg0w2l8pj3i0y4510i0s04p8nhxcsa2z41bjsv0k66npb81";
   };
 
   propagatedBuildInputs = [ six ];
diff --git a/pkgs/development/python-modules/mautrix-appservice/default.nix b/pkgs/development/python-modules/mautrix-appservice/default.nix
new file mode 100644
index 00000000000..1420f1880a3
--- /dev/null
+++ b/pkgs/development/python-modules/mautrix-appservice/default.nix
@@ -0,0 +1,28 @@
+{ lib, buildPythonPackage, fetchPypi, aiohttp, future-fstrings, pythonOlder }:
+
+buildPythonPackage rec {
+  pname = "mautrix-appservice";
+  version = "0.3.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1615220f5bb75e2093ad1e30f4c2e1243499b0b20caef014fd73faadd3bfea6c";
+  };
+
+  propagatedBuildInputs = [
+    aiohttp
+    future-fstrings
+  ];
+
+  # No tests available
+  doCheck = false;
+
+  disabled = pythonOlder "3.5";
+
+  meta = with lib; {
+    homepage = https://github.com/tulir/mautrix-appservice-python;
+    description = "A Python 3 asyncio-based Matrix application service framework";
+    license = licenses.mit;
+    maintainers = with maintainers; [ nyanloutre ];
+  };
+}
diff --git a/pkgs/development/python-modules/mechanize/default.nix b/pkgs/development/python-modules/mechanize/default.nix
index 63a255c941c..fa6ea72129f 100644
--- a/pkgs/development/python-modules/mechanize/default.nix
+++ b/pkgs/development/python-modules/mechanize/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "mechanize";
-  version = "0.3.7";
+  version = "0.4.0";
   disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1licf3wiy21pncg8hkx58r7xj4ylrqa8jcfh9n4rh23rmykf2rpf";
+    sha256 = "15g58z3hy1pgi5sygpif28jyqj79iz4vw2mh5nxdydl4w20micvf";
   };
 
   propagatedBuildInputs = [ html5lib ];
diff --git a/pkgs/development/python-modules/mozsvc/default.nix b/pkgs/development/python-modules/mozsvc/default.nix
index b7fed9e6ad9..a7b3984b912 100644
--- a/pkgs/development/python-modules/mozsvc/default.nix
+++ b/pkgs/development/python-modules/mozsvc/default.nix
@@ -1,7 +1,6 @@
 { stdenv
 , buildPythonPackage
-, fetchgit
-, fetchurl
+, fetchFromGitHub
 , pyramid
 , simplejson
 , konfig
@@ -9,26 +8,22 @@
 
 buildPythonPackage rec {
   pname = "mozsvc";
-  version = "0.8";
+  version = "0.10";
 
-  src = fetchgit {
-    url = https://github.com/mozilla-services/mozservices.git;
-    rev = "refs/tags/${version}";
-    sha256 = "1zci2ikk83mf7va88c83dr6snfh4ddjqw0lsg3y29qk5nxf80vx2";
+  src = fetchFromGitHub {
+    owner = "mozilla-services";
+    repo = "mozservices";
+    rev = version;
+    sha256 = "0a0558g8j55pd1nnhnnf3k377jv6cah8lxb24v98rq8kxr5960cg";
   };
 
-  patches = stdenv.lib.singleton (fetchurl {
-    url = https://github.com/nbp/mozservices/commit/f86c0b0b870cd8f80ce90accde9e16ecb2e88863.diff;
-    sha256 = "1lnghx821f6dqp3pa382ka07cncdz7hq0mkrh44d0q3grvrlrp9n";
-  });
-
-  doCheck = false; # lazy packager
+  doCheck = false; # too many dependencies and conflicting versions; I (nadrieril) gave up
   propagatedBuildInputs = [ pyramid simplejson konfig ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/mozilla-services/mozservices;
     description = "Various utilities for Mozilla apps";
     license = licenses.mpl20;
+    maintainers = with maintainers; [ nadrieril ];
   };
-
 }
diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix
index 888e1de6aa5..5da8257ac81 100644
--- a/pkgs/development/python-modules/nbxmpp/default.nix
+++ b/pkgs/development/python-modules/nbxmpp/default.nix
@@ -2,7 +2,7 @@
 
 let
   pname = "nbxmpp";
-  version = "0.6.8";
+  version = "0.6.9";
   name = "${pname}-${version}";
 in buildPythonPackage rec {
   inherit pname version;
@@ -11,7 +11,7 @@ in buildPythonPackage rec {
     name = "${name}.tar.bz2";
     url = "https://dev.gajim.org/gajim/python-nbxmpp/repository/archive.tar.bz2?"
         + "ref=${name}";
-    sha256 = "09zrqz01j45kvayfscd66avkrnn237lbjg9li5hjhyw92h6hkkc4";
+    sha256 = "14xrq0r5k1dk7rwj4cxyxfapi6gbnqg70mz94g6hn9ij06284mi7";
   };
 
   propagatedBuildInputs = [ pyopenssl ];
diff --git a/pkgs/development/python-modules/nose_progressive/default.nix b/pkgs/development/python-modules/nose_progressive/default.nix
index a8962bcecc2..6d9d98f27ab 100644
--- a/pkgs/development/python-modules/nose_progressive/default.nix
+++ b/pkgs/development/python-modules/nose_progressive/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3a6e2833e613c1c239baf05a19f66b5920915e62c07251d3ab3f3acb017ef5d7";
+    sha256 = "1mzmgq0wnfizmg9m2wn0c9g9282rdgv1jnphp8ww5h8kwqrjhvis";
   };
 
   buildInputs = [ nose ];
diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix
index abaed3cbffe..461cd480c9f 100644
--- a/pkgs/development/python-modules/peewee/default.nix
+++ b/pkgs/development/python-modules/peewee/default.nix
@@ -10,14 +10,14 @@
 buildPythonPackage rec {
 
   pname = "peewee";
-  version = "3.8.1";
+  version = "3.8.2";
 
   # pypi release does not provide tests
   src = fetchFromGitHub {
     owner = "coleifer";
     repo = pname;
     rev = version;
-    sha256 = "0z6fdihmvqfg0ysa94g4w2w7146fsi2gnrgh90b4i1s3wj8iaxqy";
+    sha256 = "0h6wr7yq4cpnh2ypm83asvs2y54346f5j9xbg4lwb0w3rgr9zndq";
   };
 
 
diff --git a/pkgs/development/python-modules/pika/default.nix b/pkgs/development/python-modules/pika/default.nix
index 4cd86b56c20..ec00a2e400a 100644
--- a/pkgs/development/python-modules/pika/default.nix
+++ b/pkgs/development/python-modules/pika/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname = "pika";
-  version = "0.12.0";
+  version = "0.13.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "306145b8683e016d81aea996bcaefee648483fc5a9eb4694bb488f54df54a751";
+    sha256 = "1104b0jm7qs9b211hw6siddflvf56ag4lfsjy6yfbczds4lxhf2k";
   };
 
   # Tests require twisted which is only availalble for python-2.x
diff --git a/pkgs/development/python-modules/precis-i18n/default.nix b/pkgs/development/python-modules/precis-i18n/default.nix
new file mode 100644
index 00000000000..4c50aaee706
--- /dev/null
+++ b/pkgs/development/python-modules/precis-i18n/default.nix
@@ -0,0 +1,20 @@
+{ lib, buildPythonPackage, fetchPypi, isPy3k }:
+
+buildPythonPackage rec {
+  pname = "precis-i18n";
+  version = "1.0.0";
+
+  disabled = !isPy3k;
+
+  src = fetchPypi {
+    pname = "precis_i18n";
+    inherit version;
+    sha256 = "0gjhvwd8aifx94rl1ag08vlmndyx2q3fkyqb0c4i46x3p2bc2yi2";
+  };
+
+  meta = {
+    homepage = https://github.com/byllyfish/precis_i18n;
+    description = "Internationalized usernames and passwords";
+    license = lib.licenses.mit;
+  };
+}
diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix
index a66d8f7a025..899b18eecbe 100644
--- a/pkgs/development/python-modules/pyarrow/default.nix
+++ b/pkgs/development/python-modules/pyarrow/default.nix
@@ -19,8 +19,9 @@ buildPythonPackage rec {
   PYARROW_CMAKE_OPTIONS = [
     "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib"
 
-    # for some reason cmake won't set -std=c++11 for clang
-    "-DPYARROW_CXXFLAGS=-std=c++11"
+    # This doesn't use setup hook to call cmake so we need to workaround #54606
+    # ourselves
+    "-DCMAKE_POLICY_DEFAULT_CMP0025=NEW"
   ];
 
   preCheck = ''
diff --git a/pkgs/development/python-modules/pydub/default.nix b/pkgs/development/python-modules/pydub/default.nix
index cbadd518897..669d798312b 100644
--- a/pkgs/development/python-modules/pydub/default.nix
+++ b/pkgs/development/python-modules/pydub/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "pydub";
-  version = "0.23.0";
+  version = "0.23.1";
   # pypi version doesn't include required data files for tests
   src = fetchFromGitHub {
     owner = "jiaaro";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1ijp9hlxi2d0f1ah9yj9j8cz18i9ny9jwrf2irvz58bgyv29m8bn";
+    sha256 = "1v0bghy4j2nnkgf1r8rbz4s7war872asyy08pc0x1iy1qs275i7s";
   };
 
 
diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix
index 56e8f1fa5eb..4826db3a8c0 100644
--- a/pkgs/development/python-modules/pygobject/default.nix
+++ b/pkgs/development/python-modules/pygobject/default.nix
@@ -17,6 +17,8 @@ buildPythonPackage rec {
     # Fix warning spam
     ./pygobject-2.28.6-set_qdata.patch
     ./pygobject-2.28.6-gio-types-2.32.patch
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+    ./pygobject-2.0-fix-darwin.patch
   ];
 
   configureFlags = [ "--disable-introspection" ];
diff --git a/pkgs/development/python-modules/pygobject/pygobject-2.0-fix-darwin.patch b/pkgs/development/python-modules/pygobject/pygobject-2.0-fix-darwin.patch
new file mode 100644
index 00000000000..7fef05262f4
--- /dev/null
+++ b/pkgs/development/python-modules/pygobject/pygobject-2.0-fix-darwin.patch
@@ -0,0 +1,88 @@
+--- a/gio/unix-types.defs
++++ b/gio/unix-types.defs
+@@ -7,18 +7,6 @@
+   (gtype-id "G_TYPE_UNIX_CONNECTION")
+ )
+ 
+-(define-object DesktopAppInfo
+-  (docstring
+-  "DesktopAppInfo(desktop_id) -> gio.unix.DesktopAppInfo\n\n"
+-  "gio.Unix.DesktopAppInfo is an implementation of gio.AppInfo\n"
+-  "based on desktop files."
+-  )
+-  (in-module "giounix")
+-  (parent "GObject")
+-  (c-name "GDesktopAppInfo")
+-  (gtype-id "G_TYPE_DESKTOP_APP_INFO")
+-)
+-
+ (define-object FDMessage
+   (in-module "giounix")
+   (parent "GSocketControlMessage")
+--- a/gio/unix.defs
++++ b/gio/unix.defs
+@@ -32,54 +32,6 @@
+ 
+ 
+ 
+-;; From gdesktopappinfo.h
+-
+-(define-function desktop_app_info_get_type
+-  (c-name "g_desktop_app_info_get_type")
+-  (return-type "GType")
+-)
+-
+-(define-function desktop_app_info_new_from_filename
+-  (c-name "g_desktop_app_info_new_from_filename")
+-  (return-type "GDesktopAppInfo*")
+-  (parameters
+-    '("const-char*" "filename")
+-  )
+-)
+-
+-(define-function g_desktop_app_info_new_from_keyfile
+-  (c-name "g_desktop_app_info_new_from_keyfile")
+-  (return-type "GDesktopAppInfo*")
+-  (parameters
+-    '("GKeyFile*" "key_file")
+-  )
+-)
+-
+-(define-function desktop_app_info_new
+-  (c-name "g_desktop_app_info_new")
+-  (is-constructor-of "GDesktopAppInfo")
+-  (return-type "GDesktopAppInfo*")
+-  (parameters
+-    '("const-char*" "desktop_id")
+-  )
+-)
+-
+-(define-method get_is_hidden
+-  (of-object "GDesktopAppInfo")
+-  (c-name "g_desktop_app_info_get_is_hidden")
+-  (return-type "gboolean")
+-)
+-
+-(define-function desktop_app_info_set_desktop_env
+-  (c-name "g_desktop_app_info_set_desktop_env")
+-  (return-type "none")
+-  (parameters
+-    '("const-char*" "desktop_env")
+-  )
+-)
+-
+-
+-
+ ;; From gunixfdmessage.h
+ 
+ (define-function g_unix_fd_message_get_type
+--- a/gio/unix.override
++++ b/gio/unix.override
+@@ -24,7 +24,6 @@
+ #define NO_IMPORT_PYGOBJECT
+ #include <pygobject.h>
+ #include <gio/gio.h>
+-#include <gio/gdesktopappinfo.h>
+ #include <gio/gunixinputstream.h>
+ #include <gio/gunixmounts.h>
+ #include <gio/gunixoutputstream.h>
diff --git a/pkgs/development/python-modules/pysam/default.nix b/pkgs/development/python-modules/pysam/default.nix
index 3138c114e69..05f2db8ac06 100644
--- a/pkgs/development/python-modules/pysam/default.nix
+++ b/pkgs/development/python-modules/pysam/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname   = "pysam";
-  version = "0.15.1";
+  version = "0.15.2";
 
   # Fetching from GitHub instead of PyPi cause the 0.13 src release on PyPi is
   # missing some files which cause test failures.
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "pysam-developers";
     repo = "pysam";
     rev = "v${version}";
-    sha256 = "1vj367w6xbn9bpmksm162l1aipf7cj97h1q83y7jcpm33ihwpf7x";
+    sha256 = "03aczbzx6gmvgy60fhswpwkry7a8zb5q1pbp55v5gx8hk15n40k1";
   };
 
   buildInputs = [ bzip2 curl cython lzma zlib ];
diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix
index 29dd344a34c..0eca6c5ddf0 100644
--- a/pkgs/development/python-modules/pyspark/default.nix
+++ b/pkgs/development/python-modules/pyspark/default.nix
@@ -2,16 +2,19 @@
 
 buildPythonPackage rec {
   pname = "pyspark";
-  version = "2.3.2";
+  version = "2.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7fb3b4fe47edb0fb78cecec37e0f2a728590f17ef6a49eae55141a7a374c07c8";
+    sha256 = "1p7z5f1a20l7xkjkh88q9cvjw2x8jbrlydkycn5lh4qvx72vgmy9";
   };
 
   # pypandoc is broken with pandoc2, so we just lose docs.
   postPatch = ''
     sed -i "s/'pypandoc'//" setup.py
+
+    # Current release works fine with py4j 0.10.8.1
+    substituteInPlace setup.py --replace py4j==0.10.7 'py4j>=0.10.7,<0.11'
   '';
 
   propagatedBuildInputs = [ py4j ];
diff --git a/pkgs/development/python-modules/python-vagrant/default.nix b/pkgs/development/python-modules/python-vagrant/default.nix
new file mode 100644
index 00000000000..88982f15293
--- /dev/null
+++ b/pkgs/development/python-modules/python-vagrant/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  version = "0.5.15";
+  pname = "python-vagrant";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1ikrh6canhcxg5y7pzmkcnnydikppv7s6sm9prfx90nk0ac8m6mg";
+  };
+
+  # The tests try to connect to qemu
+  doCheck = false;
+
+  meta = {
+    description = "Python module that provides a thin wrapper around the vagrant command line executable";
+    homepage = https://github.com/todddeluca/python-vagrant;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.pmiddend ];
+  };
+}
diff --git a/pkgs/development/python-modules/pyu2f/default.nix b/pkgs/development/python-modules/pyu2f/default.nix
new file mode 100644
index 00000000000..16aa7b0ec31
--- /dev/null
+++ b/pkgs/development/python-modules/pyu2f/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, lib, fetchFromGitHub, buildPythonPackage,
+  six, mock, pyfakefs, unittest2, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "pyu2f";
+  version = "0.1.4";
+
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = pname;
+    rev = version;
+    sha256 = "0waxdydvxn05a8ab9j235mz72x7p4pwa59pnxyk1zzbwxnpxb3p9";
+  };
+
+  # Platform detection for linux fails
+  postPatch = lib.optionalString stdenv.isLinux ''
+    rm pyu2f/tests/hid/macos_test.py
+  '';
+
+  propagatedBuildInputs = [ six ];
+
+  checkInputs = [ pytest six mock pyfakefs unittest2 ];
+
+  checkPhase = ''
+    pytest pyu2f/tests
+  '';
+
+  meta = with lib; {
+    description = "U2F host library for interacting with a U2F device over USB";
+    homepage = https://github.com/google/pyu2f/;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ prusnak ];
+  };
+}
diff --git a/pkgs/development/python-modules/qscintilla-qt5/default.nix b/pkgs/development/python-modules/qscintilla-qt5/default.nix
new file mode 100644
index 00000000000..788b2e9e9ae
--- /dev/null
+++ b/pkgs/development/python-modules/qscintilla-qt5/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, buildPythonPackage
+, qscintillaCpp
+, lndir
+, sip
+, python
+, pyqt5 }:
+
+buildPythonPackage rec {
+  pname = "qscintilla";
+  version = qscintillaCpp.version;
+  src = qscintillaCpp.src;
+  format = "other";
+
+  nativeBuildInputs = [ lndir sip ];
+  buildInputs = [ qscintillaCpp ];
+  propagatedBuildInputs = [ pyqt5 ];
+
+  preConfigure = ''
+    mkdir -p $out
+    lndir ${pyqt5} $out
+    rm -rf "$out/nix-support"
+    cd Python
+    ${python.executable} ./configure.py \
+      --pyqt=PyQt5 \
+      --destdir=$out/lib/${python.sitePackages}/PyQt5 \
+      --stubsdir=$out/lib/${python.sitePackages}/PyQt5 \
+      --apidir=$out/api/${python.libPrefix} \
+      --qsci-incdir=${qscintillaCpp}/include \
+      --qsci-libdir=${qscintillaCpp}/lib \
+      --pyqt-sipdir=${pyqt5}/share/sip/PyQt5 \
+      --qsci-sipdir=$out/share/sip/PyQt5
+  '';
+
+  meta = with lib; {
+    description = "A Python binding to QScintilla, Qt based text editing control";
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ lsix ];
+    homepage = https://www.riverbankcomputing.com/software/qscintilla/;
+  };
+}
diff --git a/pkgs/development/python-modules/rlp/default.nix b/pkgs/development/python-modules/rlp/default.nix
index d9b55c85219..c8c4315b66b 100644
--- a/pkgs/development/python-modules/rlp/default.nix
+++ b/pkgs/development/python-modules/rlp/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "rlp";
-  version = "1.0.3";
+  version = "1.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b0ad3f3173dedf416565299f684717d4ae7620207d562d3ef94b818a40a48781";
+    sha256 = "0742hdnhwcx1bm7pdk83290rxfcb0i2xskgl8yn6lg8fql1hms7b";
   };
 
   checkInputs = [ pytest hypothesis ];
diff --git a/pkgs/development/python-modules/serversyncstorage/default.nix b/pkgs/development/python-modules/serversyncstorage/default.nix
index 0e4b6cfa1e4..7342a729e29 100644
--- a/pkgs/development/python-modules/serversyncstorage/default.nix
+++ b/pkgs/development/python-modules/serversyncstorage/default.nix
@@ -1,5 +1,6 @@
-{ buildPythonPackage
-, fetchgit
+{ stdenv
+, buildPythonPackage
+, fetchFromGitHub
 , isPy27
 , testfixtures
 , unittest2
@@ -20,13 +21,14 @@
 
 buildPythonPackage rec {
   pname = "serversyncstorage";
-  version = "1.6.11";
+  version = "1.6.14";
   disabled = !isPy27;
 
-  src = fetchgit {
-    url = https://github.com/mozilla-services/server-syncstorage.git;
-    rev = "refs/tags/${version}";
-    sha256 = "197gj2jfs2c6nzs20j37kqxwi91wabavxnfm4rqmrjwhgqjwhnm0";
+  src = fetchFromGitHub {
+    owner = "mozilla-services";
+    repo = "server-syncstorage";
+    rev = version;
+    sha256 = "08xclxj38rav8yay9cijiavv35jbyf6a9jzr24vgcna8pjjnbbmh";
   };
 
   checkInputs = [ testfixtures unittest2 webtest ];
@@ -35,7 +37,10 @@ buildPythonPackage rec {
     pymysqlsa umemcache WSGIProxy requests pybrowserid
   ];
 
-  meta = {
-    broken = true; # 2018-11-04
+  meta = with stdenv.lib; {
+    description = "The SyncServer server software, as used by Firefox Sync";
+    homepage = https://github.com/mozilla-services/server-syncstorage;
+    license = licenses.mpl20;
+    maintainers = with maintainers; [ nadrieril ];
   };
 }
diff --git a/pkgs/development/python-modules/sphinx-argparse/default.nix b/pkgs/development/python-modules/sphinx-argparse/default.nix
new file mode 100644
index 00000000000..f5de476d109
--- /dev/null
+++ b/pkgs/development/python-modules/sphinx-argparse/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytest
+, sphinx
+}:
+
+buildPythonPackage rec {
+  pname = "sphinx-argparse";
+  version = "0.2.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "05wc8f5hb3jsg2vh2jf7jsyan8d4i09ifrz2c8fp6f7x1zw9iav0";
+  };
+
+  checkInputs = [
+    pytest
+  ];
+
+  checkPhase = "py.test";
+
+  propagatedBuildInputs = [
+    sphinx
+  ];
+
+  meta = {
+    description = "A sphinx extension that automatically documents argparse commands and options";
+    homepage = https://github.com/ribozz/sphinx-argparse;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ clacke ];
+  };
+}
diff --git a/pkgs/development/python-modules/syncserver/default.nix b/pkgs/development/python-modules/syncserver/default.nix
deleted file mode 100644
index 7a93d64a89f..00000000000
--- a/pkgs/development/python-modules/syncserver/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ buildPythonPackage
-, fetchgit
-, isPy27
-, unittest2
-, cornice
-, gunicorn
-, pyramid
-, requests
-, simplejson
-, sqlalchemy
-, mozsvc
-, tokenserver
-, serversyncstorage
-, configparser
-}:
-
-buildPythonPackage rec {
-  pname = "syncserver";
-  version = "1.6.0";
-  disabled = ! isPy27;
-
-  src = fetchgit {
-    url = https://github.com/mozilla-services/syncserver.git;
-    rev = "refs/tags/${version}";
-    sha256 = "1fsiwihgq3z5b5kmssxxil5g2abfvsf6wfikzyvi4sy8hnym77mb";
-  };
-
-  buildInputs = [ unittest2 ];
-  propagatedBuildInputs = [
-    cornice gunicorn pyramid requests simplejson sqlalchemy mozsvc tokenserver
-    serversyncstorage configparser
-  ];
-}
diff --git a/pkgs/development/python-modules/tableaudocumentapi/default.nix b/pkgs/development/python-modules/tableaudocumentapi/default.nix
new file mode 100644
index 00000000000..a2f8fbb2f53
--- /dev/null
+++ b/pkgs/development/python-modules/tableaudocumentapi/default.nix
@@ -0,0 +1,24 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "tableaudocumentapi";
+  version = "0.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "fc6d44b62cf6ea29916c073686e2f9f35c9902eccd57b8493f8d44a59a2f60d9";
+  };
+
+  # tests not inclued with release
+  doCheck = false;
+
+  meta = with lib; {
+    description = "A Python module for working with Tableau files";
+    homepage = https://github.com/tableau/document-api-python;
+    license = licenses.mit;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix
new file mode 100644
index 00000000000..c6d3a21b10b
--- /dev/null
+++ b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildPythonPackage, fetchPypi, sqlalchemy, telethon }:
+
+buildPythonPackage rec {
+  pname = "telethon-session-sqlalchemy";
+  version = "0.2.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "b392096b14e5cdc4040d3900cc2be7847b160ed77e5c861a6bd07d75d8e17a85";
+  };
+
+  propagatedBuildInputs = [
+    sqlalchemy
+  ];
+
+  # No tests available
+  doCheck = false;
+
+  meta = with lib; {
+    homepage = https://github.com/tulir/telethon-session-sqlalchemy;
+    description = "SQLAlchemy backend for Telethon session storage";
+    license = licenses.mit;
+    maintainers = with maintainers; [ nyanloutre ];
+  };
+}
diff --git a/pkgs/development/python-modules/telethon/default.nix b/pkgs/development/python-modules/telethon/default.nix
new file mode 100644
index 00000000000..d847a494201
--- /dev/null
+++ b/pkgs/development/python-modules/telethon/default.nix
@@ -0,0 +1,30 @@
+{ lib, buildPythonPackage, fetchPypi, async_generator, rsa, pyaes, pythonOlder }:
+
+buildPythonPackage rec {
+  pname = "telethon";
+  version = "1.5.4";
+
+  src = fetchPypi {
+    inherit version;
+    pname = "Telethon";
+    sha256 = "52cb4929bf37c98ab5f3e173325dbb3cb9c1ca3f4fe6ba87d35c43e2f98858ce";
+  };
+
+  propagatedBuildInputs = [
+    async_generator
+    rsa
+    pyaes
+  ];
+
+  # No tests available
+  doCheck = false;
+
+  disabled = pythonOlder "3.5";
+
+  meta = with lib; {
+    homepage = https://github.com/LonamiWebs/Telethon;
+    description = "Full-featured Telegram client library for Python 3";
+    license = licenses.mit;
+    maintainers = with maintainers; [ nyanloutre ];
+  };
+}
diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix
index fdfa91d292f..4272df1ce39 100644
--- a/pkgs/development/python-modules/textacy/default.nix
+++ b/pkgs/development/python-modules/textacy/default.nix
@@ -52,6 +52,11 @@ buildPythonPackage rec {
     unidecode
   ];
 
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "'ftfy>=4.2.0,<5.0.0'," "'ftfy>=5.0.0',"
+  '';
+
   doCheck = false;  # tests want to download data files
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/texttable/default.nix b/pkgs/development/python-modules/texttable/default.nix
index 6747ae78f49..d2821310068 100644
--- a/pkgs/development/python-modules/texttable/default.nix
+++ b/pkgs/development/python-modules/texttable/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "texttable";
-  version = "1.5.0";
+  version = "1.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0mzv6zs8ciwnf83fwikqmmjwbzqmdja3imn4b4k209f80g0rk8qv";
+    sha256 = "1z3xbijvhh86adg0jk5iv1jvga7cg25q1w12icb3snr5jim9sjv2";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/tokenserver/default.nix b/pkgs/development/python-modules/tokenserver/default.nix
index a07da568dca..08f3f87321f 100644
--- a/pkgs/development/python-modules/tokenserver/default.nix
+++ b/pkgs/development/python-modules/tokenserver/default.nix
@@ -31,5 +31,6 @@ buildPythonPackage rec {
     description = "The Mozilla Token Server";
     homepage = https://github.com/mozilla-services/tokenserver;
     license = licenses.mpl20;
+    maintainers = with maintainers; [ nadrieril ];
   };
 }
diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix
index a616df65122..ba37373e8ea 100644
--- a/pkgs/development/python-modules/twilio/default.nix
+++ b/pkgs/development/python-modules/twilio/default.nix
@@ -3,13 +3,13 @@
 
 buildPythonPackage rec {
   pname = "twilio";
-  version = "6.23.0";
+  version = "6.23.1";
   # tests not included in PyPi, so fetch from github instead
   src = fetchFromGitHub {
     owner = "twilio";
     repo = "twilio-python";
     rev = version;
-    sha256 = "07fb8sklj8527aa8hi71w4iibgmcnndmnqjdcp82ff80ladn9i5y";
+    sha256 = "0f6r2qcgcg4pnnsgf9d1k03ri7h7k8kpasp9mdgv421a4rvqh8lm";
   };
 
   buildInputs = [ nose mock ];
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 724435c01ca..8bc22d9c9a7 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -22,8 +22,9 @@
 , pkgconfig , ncurses, xapian_1_2_22, gpgme, utillinux, fetchpatch, tzdata, icu, libffi
 , cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl
 , msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem
-, cairo, re2, rake, gobject-introspection, gdk_pixbuf, zeromq, graphicsmagick, libcxx, file
-, libselinux ? null, libsepol ? null, libvirt
+, cairo, re2, rake, gobject-introspection, gdk_pixbuf, zeromq, czmq, graphicsmagick, libcxx
+, file, libvirt, glib, vips
+, libselinux ? null, libsepol ? null
 }@args:
 
 let
@@ -301,6 +302,11 @@ in
     buildInputs = [ rainbow_rake ];
   };
 
+  rbczmq = { ... }: {
+    buildInputs = [ zeromq czmq ];
+    buildFlags = [ "--with-system-libs" ];
+  };
+
   rbnacl = spec:
     if lib.versionOlder spec.version "6.0.0" then {
       postInstall = ''
@@ -340,6 +346,22 @@ in
       "--with-ldflags=-L${ncurses.out}/lib"
     ];
   };
+
+  ruby-vips = attrs: {
+    postInstall = ''
+      cd "$(cat $out/nix-support/gem-meta/install-path)"
+
+      substituteInPlace lib/vips.rb \
+        --replace "glib-2.0" "${glib.out}/lib/libglib-2.0${stdenv.hostPlatform.extensions.sharedLibrary}"
+
+      substituteInPlace lib/vips.rb \
+        --replace "gobject-2.0" "${glib.out}/lib/libgobject-2.0${stdenv.hostPlatform.extensions.sharedLibrary}"
+
+      substituteInPlace lib/vips.rb \
+        --replace "vips_libname = 'vips'" "vips_libname = '${vips}/lib/libvips${stdenv.hostPlatform.extensions.sharedLibrary}'"
+    '';
+  };
+
   rugged = attrs: {
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ cmake openssl libssh2 zlib ];
@@ -419,10 +441,16 @@ in
 
   tzinfo = attrs: lib.optionalAttrs (lib.versionAtLeast attrs.version "1.0") {
     dontBuild = false;
-    postPatch = ''
-      substituteInPlace lib/tzinfo/zoneinfo_data_source.rb \
-        --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
-    '';
+    postPatch =
+      let
+        path = if lib.versionAtLeast attrs.version "2.0"
+               then "lib/tzinfo/data_sources/zoneinfo_data_source.rb"
+               else "lib/tzinfo/zoneinfo_data_source.rb";
+      in
+        ''
+          substituteInPlace ${path} \
+            --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
+        '';
   };
 
   uuid4r = attrs: {
diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix
index 7804897bb81..9ae81e073df 100644
--- a/pkgs/development/tools/ammonite/default.nix
+++ b/pkgs/development/tools/ammonite/default.nix
@@ -5,12 +5,12 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "ammonite-${version}";
-  version = "1.6.2";
+  version = "1.6.3";
   scalaVersion = "2.12";
 
   src = fetchurl {
     url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}";
-    sha256 = "0am21zrnl48d397ll4pfsrgk079jb7x8z9kpfm6fz9hznrbl12hl";
+    sha256 = "0wdicgf41ysxcdly4hzpav52yhjx410c7c7nfbq87p0cqzywrbxd";
   };
 
   propagatedBuildInputs = [ jre ] ;
diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index 15ef2abd094..75ab82a0ac6 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -1,10 +1,11 @@
 { stdenv, callPackage, lib, fetchurl, fetchpatch, runCommand, makeWrapper
-, jdk, zip, unzip, bash, writeCBin, coreutils
+, zip, unzip, bash, writeCBin, coreutils
 , which, python, perl, gawk, gnused, gnutar, gnugrep, gzip, findutils
 # Apple dependencies
 , cctools, clang, libcxx, CoreFoundation, CoreServices, Foundation
 # Allow to independently override the jdks used to build and run respectively
-, buildJdk ? jdk, runJdk ? jdk
+, buildJdk, runJdk
+, buildJdkName
 # Always assume all markers valid (don't redownload dependencies).
 # Also, don't clean up environment variables.
 , enableNixHacks ? false
@@ -53,10 +54,13 @@ let
     #
     [ bash coreutils findutils gawk gnugrep gnutar gnused gzip which unzip ];
 
+  # Java toolchain used for the build and tests
+  javaToolchain = "@bazel_tools//tools/jdk:toolchain_host${buildJdkName}";
+
 in
 stdenv.mkDerivation rec {
 
-  version = "0.21.0";
+  version = "0.22.0";
 
   meta = with lib; {
     homepage = "https://github.com/bazelbuild/bazel/";
@@ -79,8 +83,8 @@ stdenv.mkDerivation rec {
   name = "bazel-${version}";
 
   src = fetchurl {
-    url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
-    sha256 = "1d3x0f1hzaiqq00pd65bks7v8kbv57m13jsing7y0y9id0g87jvc";
+    url = "https://github.com/bazelbuild/bazel/releases/download/${version}/${name}-dist.zip";
+    sha256 = "0hannnvia8rvmi2v5d97j1f6wv0m1kxkd5hq4aqp0dqjr0ka4q38";
   };
 
   sourceRoot = ".";
@@ -177,11 +181,6 @@ stdenv.mkDerivation rec {
       substituteInPlace scripts/bootstrap/compile.sh \
           --replace /bin/sh ${customBash}/bin/bash
 
-      # We only build with JDK8 for now, since JDK11 does not compile bazel
-      substituteInPlace tools/jdk/default_java_toolchain.bzl \
-        --replace '"jvm_opts": JDK9_JVM_OPTS' \
-                  '"jvm_opts": JDK8_JVM_OPTS'
-
       # add nix environment vars to .bazelrc
       cat >> .bazelrc <<EOF
       build --experimental_distdir=${distDir}
@@ -191,6 +190,7 @@ stdenv.mkDerivation rec {
       build --linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt="-Wl,/g')"
       build --host_linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt="-Wl,/g')"
       build --host_javabase='@local_jdk//:jdk'
+      build --host_java_toolchain='${javaToolchain}'
       EOF
 
       # add the same environment vars to compile.sh
@@ -199,6 +199,7 @@ stdenv.mkDerivation rec {
           -e "/\$command \\\\$/a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" \
           -e "/\$command \\\\$/a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" \
           -e "/\$command \\\\$/a --host_javabase='@local_jdk//:jdk' \\\\" \
+          -e "/\$command \\\\$/a --host_java_toolchain='${javaToolchain}' \\\\" \
           -i scripts/bootstrap/compile.sh
 
       # --experimental_strict_action_env (which will soon become the
@@ -268,7 +269,9 @@ stdenv.mkDerivation rec {
     export TEST_TMPDIR=$(pwd)
 
     hello_test () {
-      $out/bin/bazel test --test_output=errors \
+      $out/bin/bazel test \
+        --test_output=errors \
+        --java_toolchain='${javaToolchain}' \
         examples/cpp:hello-success_test \
         examples/java-native/src/test/java/com/example/myproject:hello
     }
diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix
index 8f3622e186c..c20985f31dc 100644
--- a/pkgs/development/tools/build-managers/bloop/default.nix
+++ b/pkgs/development/tools/build-managers/bloop/default.nix
@@ -2,7 +2,7 @@
 
 let
   baseName = "bloop";
-  version = "1.2.3";
+  version = "1.2.5";
   deps = stdenv.mkDerivation {
     name = "${baseName}-deps-${version}";
     buildCommand = ''
@@ -16,7 +16,7 @@ let
     '';
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash     = "0d0q4rzz21afzfclm3sjp940wk7p8cllbxsidr6rg3r1qqhzawlr";
+    outputHash     = "19373fyb0g7irrdzb1vsjmyv5xj84qwbcfb6lm076px7wfyn0w1c";
   };
 in
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/3.x.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/3.x.nix
index 2ceaee5650b..e8266c2efe2 100644
--- a/pkgs/development/tools/continuous-integration/buildkite-agent/3.x.nix
+++ b/pkgs/development/tools/continuous-integration/buildkite-agent/3.x.nix
@@ -1,12 +1,15 @@
-{ callPackage, fetchFromGitHub, ... } @ args:
+{ bash, callPackage, fetchFromGitHub, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
   src = fetchFromGitHub {
     owner = "buildkite";
     repo = "agent";
     rev = "v${version}";
-    sha256 = "09smyrzp1xkczlmh8vqb7bmjb2b5d6yf9birjgaw36c6m44bpfvs";
+    sha256 = "0sr1rxl92d4wdipl66f1yymx5bmyj1y85v6k22v57rzr6yhyfmsf";
   };
-  version = "3.0.1";
+  version = "3.8.4";
   hasBootstrapScript = false;
+  postPatch = ''
+    substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash
+  '';
 })
diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix
index 8aa02ac307d..ba0be89abf3 100644
--- a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix
+++ b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix
@@ -1,5 +1,5 @@
 { stdenv, buildGoPackage, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep
-, src, version, hasBootstrapScript
+, src, version, hasBootstrapScript, postPatch ? ""
 , ... }:
 let
   goPackagePath = "github.com/buildkite/agent";
@@ -7,14 +7,10 @@ in
 buildGoPackage {
   name = "buildkite-agent-${version}";
 
-  inherit goPackagePath src;
+  inherit goPackagePath src postPatch;
 
   nativeBuildInputs = [ makeWrapper ];
 
-  # on Linux, the TMPDIR is /build which is the same prefix as this package
-  # remove once #35068 is merged
-  noAuditTmpdir = stdenv.isLinux;
-
   postInstall = ''
     ${stdenv.lib.optionalString hasBootstrapScript ''
     # Install bootstrap.sh
diff --git a/pkgs/development/tools/database/litecli/default.nix b/pkgs/development/tools/database/litecli/default.nix
new file mode 100644
index 00000000000..cbf1af44057
--- /dev/null
+++ b/pkgs/development/tools/database/litecli/default.nix
@@ -0,0 +1,51 @@
+{ lib, python3Packages }:
+
+python3Packages.buildPythonApplication rec {
+  pname = "litecli";
+  version = "1.0.0";
+
+  # Python 2 won't have prompt_toolkit 2.x.x
+  # See: https://github.com/NixOS/nixpkgs/blob/f49e2ad3657dede09dc998a4a98fd5033fb52243/pkgs/top-level/python-packages.nix#L3408
+  disabled = python3Packages.isPy27;
+
+  src = python3Packages.fetchPypi {
+    inherit pname version;
+    sha256 = "0s5a6r5q09144cc5169snwis5i2jrh3z2g4mw9wi2fsjxyhgpwq5";
+  };
+
+  # fixes tests https://github.com/dbcli/litecli/pull/53
+  postPatch = ''
+    substituteInPlace litecli/main.py \
+      --replace 'except FileNotFoundError:' 'except (FileNotFoundError, OSError):'
+  '';
+
+  propagatedBuildInputs = with python3Packages; [
+    cli-helpers
+    click
+    configobj
+    prompt_toolkit
+    pygments
+    sqlparse
+  ];
+
+  checkInputs = with python3Packages; [
+    pytest
+    mock
+  ];
+
+  preCheck = ''
+    export XDG_CONFIG_HOME=$TMP
+    # add missing file
+    echo "litecli is awesome!" > tests/test.txt
+  '';
+
+  meta = with lib; {
+    description = "Command-line interface for SQLite";
+    longDescription = ''
+      A command-line client for SQLite databases that has auto-completion and syntax highlighting.
+    '';
+    homepage = https://litecli.com;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ Scriptkiddi ];
+  };
+}
diff --git a/pkgs/development/tools/database/shmig/default.nix b/pkgs/development/tools/database/shmig/default.nix
index 49e90ce64c8..f6534788938 100644
--- a/pkgs/development/tools/database/shmig/default.nix
+++ b/pkgs/development/tools/database/shmig/default.nix
@@ -1,17 +1,18 @@
 { stdenv, fetchFromGitHub
-, withMySQL ? false, withPSQL ? false, withSQLite ? false
-, mysql, postgresql, sqlite, gawk, which
+, withMySQL ? true, withPSQL ? false, withSQLite ? false
+, mysql, postgresql, sqlite, gawk
 , lib
 }:
 
-stdenv.mkDerivation {
-  name = "shmig-2017-07-24";
+stdenv.mkDerivation rec {
+  name = "shmig-${version}";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "mbucc";
     repo = "shmig";
-    rev = "aff54e03d13f8f95b422cf898505490a56152a4a";
-    sha256 = "08q94dka5yqkzkis3w7j1q8kc7d3kk7mb2drx8ms59jcqvp847j3";
+    rev = "v${version}";
+    sha256 = "15ry1d51d6dlzzzhck2x57wrq48vs4n9pp20bv2sz6nk92fva5l5";
   };
 
   makeFlags = [ "PREFIX=$(out)" ];
@@ -23,8 +24,7 @@ stdenv.mkDerivation {
       --replace "\`which mysql\`" "${lib.optionalString withMySQL "${mysql.client}/bin/mysql"}" \
       --replace "\`which psql\`" "${lib.optionalString withPSQL "${postgresql}/bin/psql"}" \
       --replace "\`which sqlite3\`" "${lib.optionalString withSQLite "${sqlite}/bin/sqlite3"}" \
-      --replace "awk" "${gawk}/bin/awk" \
-      --replace "which" "${which}/bin/which"
+      --replace "awk" "${gawk}/bin/awk"
   '';
 
   preBuild = ''
diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix
new file mode 100644
index 00000000000..2bdb455f8e8
--- /dev/null
+++ b/pkgs/development/tools/fdroidserver/default.nix
@@ -0,0 +1,58 @@
+{ docker
+, fetchFromGitLab
+, python
+, lib }:
+
+python.pkgs.buildPythonApplication rec {
+  version = "1.1";
+  pname = "fdroidserver";
+
+  src = fetchFromGitLab {
+    owner = "fdroid";
+    repo = "fdroidserver";
+    rev = version;
+    sha256 = "1910ali90aj3wkxy6mi88c5ya6n7zbqr69nvmpc5dydxm0gb98w5";
+  };
+
+  patchPhase = ''
+    substituteInPlace fdroidserver/common.py --replace "FDROID_PATH = os.path.realpath(os.path.join(os.path.dirname(__file__), '..'))" "FDROID_PATH = '$out/bin'"
+    substituteInPlace setup.py --replace "pyasn1-modules == 0.2.1" "pyasn1-modules"
+  '';
+
+  preConfigure = ''
+    ${python.interpreter} setup.py compile_catalog
+  '';
+  postInstall = ''
+    install -m 0755 gradlew-fdroid $out/bin
+  '';
+
+  buildInputs = [ python.pkgs.Babel ];
+
+  propagatedBuildInputs = with python.pkgs; [
+    androguard
+    clint
+    defusedxml
+    docker
+    docker-py
+    GitPython
+    libcloud
+    mwclient
+    paramiko
+    pillow
+    pyasn1
+    pyasn1-modules
+    python-vagrant
+    pyyaml
+    qrcode
+    requests
+    ruamel_yaml
+  ];
+
+  meta = with lib; {
+    homepage = https://f-droid.org;
+    description = "Server and tools for F-Droid, the Free Software repository system for Android";
+    license = licenses.agpl3;
+    maintainers = [ lib.maintainers.pmiddend ];
+  };
+
+}
diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix
index 09b7796b5f6..a987cebdc19 100644
--- a/pkgs/development/tools/heroku/default.nix
+++ b/pkgs/development/tools/heroku/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "heroku-${version}";
-  version = "7.18.2";
+  version = "7.19.4";
 
   src = fetchurl {
     url = "https://cli-assets.heroku.com/heroku-v${version}/heroku-v${version}.tar.xz";
-    sha256 = "1dplh3bfin1g0wwbkg76z3xsja4zqj350vrzl8jfw7982saxqywh";
+    sha256 = "0l30acam8q114imgz7kzpfp6z1zwpg2sm1ygnjjdjd2bw62bmv3a";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix
index 38b495d89a6..cbe37cec3c7 100644
--- a/pkgs/development/tools/kustomize/default.nix
+++ b/pkgs/development/tools/kustomize/default.nix
@@ -3,9 +3,9 @@
 
 buildGoPackage rec {
   name = "kustomize-${version}";
-  version = "1.0.10";
-  # rev is the 1.0.10 commit, mainly for kustomize version command output
-  rev = "383b3e798b7042f8b7431f93e440fb85631890a3";
+  version = "1.0.11";
+  # rev is the 1.0.11 commit, mainly for kustomize version command output
+  rev = "8f701a00417a812558a7b785e8354957afa469ae";
 
   goPackagePath = "sigs.k8s.io/kustomize";
 
@@ -17,7 +17,7 @@ buildGoPackage rec {
   '';
 
   src = fetchFromGitHub {
-    sha256 = "1z78d5j2w78x4ks4v745050g2ffmirj03v7129dib2lfhfjra8aj";
+  sha256 = "18kc23l6r2di35md9jbinyzxr791vvdjyklaf3k725imqksikwri";
     rev = "v${version}";
     repo = "kustomize";
     owner = "kubernetes-sigs";
diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix
index e016882c8ef..b671a27ac74 100644
--- a/pkgs/development/tools/misc/lttng-tools/default.nix
+++ b/pkgs/development/tools/misc/lttng-tools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "lttng-tools-${version}";
-  version = "2.10.5";
+  version = "2.10.6";
 
   src = fetchurl {
     url = "https://lttng.org/files/lttng-tools/${name}.tar.bz2";
-    sha256 = "04bll20lqb76xi6hcjrlankvyqc1hkyj8kvc4gf867lnxxw811m4";
+    sha256 = "0z2kh6svszi332012id373bjwzcmzj6fks993f6yi35zpqmzapgh";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix
index 039e5b1ec54..27c8f609d5d 100644
--- a/pkgs/development/tools/misc/lttng-ust/default.nix
+++ b/pkgs/development/tools/misc/lttng-ust/default.nix
@@ -13,11 +13,11 @@
 
 stdenv.mkDerivation rec {
   name = "lttng-ust-${version}";
-  version = "2.10.2";
+  version = "2.10.3";
 
   src = fetchurl {
     url = "https://lttng.org/files/lttng-ust/${name}.tar.bz2";
-    sha256 = "0if0hrs32r98sp85c8c63zpgy5xjw6cx8wrs65xq227b0jwj5jn4";
+    sha256 = "0aw580xx6x9hgbxrzil7yqv12j8yvi5d9iibldx3z5jz1pwj114y";
   };
 
   buildInputs = [ python ];
diff --git a/pkgs/development/tools/vgo2nix/default.nix b/pkgs/development/tools/vgo2nix/default.nix
index 8257d5fc583..59496e8d8f0 100644
--- a/pkgs/development/tools/vgo2nix/default.nix
+++ b/pkgs/development/tools/vgo2nix/default.nix
@@ -9,7 +9,7 @@
 
 buildGoPackage rec {
   name = "vgo2nix-${version}";
-  version = "unstable-2018-12-02";
+  version = "unstable-2019-02-01";
   goPackagePath = "github.com/adisbladis/vgo2nix";
 
   nativeBuildInputs = [ makeWrapper ];
@@ -17,8 +17,8 @@ buildGoPackage rec {
   src = fetchFromGitHub {
     owner = "adisbladis";
     repo = "vgo2nix";
-    rev = "b298f4fb799fc532488fc887e1938668d7f3d219";
-    sha256 = "0gr5vfz5wzpcyxsz948aniyfbryg53agvzbkhdnb5hiwhi7nay9p";
+    rev = "8213e1ffe9e59b1f92df15a995eafd96b66da472";
+    sha256 = "1djwsw7zbprz4czaqsimpwccmmnk8wn38ksj7dis8xdvqrfy7h0g";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/development/tools/vgo2nix/deps.nix b/pkgs/development/tools/vgo2nix/deps.nix
index b8327cd6069..4f8506794d3 100644
--- a/pkgs/development/tools/vgo2nix/deps.nix
+++ b/pkgs/development/tools/vgo2nix/deps.nix
@@ -1,5 +1,140 @@
+# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
 [
-
+  {
+    goPackagePath = "github.com/alecthomas/assert";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/assert";
+      rev = "405dbfeb8e38";
+      sha256 = "1l567pi17k593nrd1qlbmiq8z9jy3qs60px2a16fdpzjsizwqx8l";
+    };
+  }
+  {
+    goPackagePath = "github.com/alecthomas/colour";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/colour";
+      rev = "60882d9e2721";
+      sha256 = "0iq566534gbzkd16ixg7fk298wd766821vvs80838yifx9yml5vs";
+    };
+  }
+  {
+    goPackagePath = "github.com/alecthomas/kingpin";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/kingpin";
+      rev = "v2.2.6";
+      sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
+    };
+  }
+  {
+    goPackagePath = "github.com/alecthomas/repr";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/repr";
+      rev = "117648cd9897";
+      sha256 = "05v1rgzdqc8razf702laagrvhvx68xd9yxxmzd3dyz0d6425pdrp";
+    };
+  }
+  {
+    goPackagePath = "github.com/alecthomas/template";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/template";
+      rev = "a0175ee3bccc";
+      sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
+    };
+  }
+  {
+    goPackagePath = "github.com/alecthomas/units";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/units";
+      rev = "2efee857e7cf";
+      sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
+    };
+  }
+  {
+    goPackagePath = "github.com/davecgh/go-spew";
+    fetch = {
+      type = "git";
+      url = "https://github.com/davecgh/go-spew";
+      rev = "v1.1.1";
+      sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-isatty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-isatty";
+      rev = "v0.0.3";
+      sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n";
+    };
+  }
+  {
+    goPackagePath = "github.com/orivej/e";
+    fetch = {
+      type = "git";
+      url = "https://github.com/orivej/e";
+      rev = "ac3492690fda";
+      sha256 = "11jizr28kfkr6zscjxg95pqi6cjp08aqnhs41sdhc98nww78ilkr";
+    };
+  }
+  {
+    goPackagePath = "github.com/orivej/go-nix";
+    fetch = {
+      type = "git";
+      url = "https://github.com/orivej/go-nix";
+      rev = "dae45d921a44";
+      sha256 = "17hfmsz8hs3h2d5c06j1bvbw8ijrhzm3iz911z5zydsl4x7y0cgy";
+    };
+  }
+  {
+    goPackagePath = "github.com/pkg/profile";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/profile";
+      rev = "v1.2.1";
+      sha256 = "0blqmvgqvdbqmh3fp9pfdxc9w1qfshrr0zy9whj0sn372bw64qnr";
+    };
+  }
+  {
+    goPackagePath = "github.com/pmezard/go-difflib";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pmezard/go-difflib";
+      rev = "v1.0.0";
+      sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+    };
+  }
+  {
+    goPackagePath = "github.com/sergi/go-diff";
+    fetch = {
+      type = "git";
+      url = "https://github.com/sergi/go-diff";
+      rev = "v1.0.0";
+      sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7";
+    };
+  }
+  {
+    goPackagePath = "github.com/stretchr/testify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/testify";
+      rev = "v1.2.2";
+      sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "d99a578cf41b";
+      sha256 = "10q9xx4pmnq92qn6ff4xp7n1hx766wvw2rf7pqcd6rx5plgwz8cm";
+    };
+  }
   {
     goPackagePath = "golang.org/x/tools";
     fetch = {
diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix
index dade09ee5f6..e9e12c7d20b 100644
--- a/pkgs/development/tools/wabt/default.nix
+++ b/pkgs/development/tools/wabt/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "wabt-${version}";
-  version = "1.0.6";
+  version = "1.0.8";
 
   src = fetchFromGitHub {
     owner  = "WebAssembly";
     repo   = "wabt";
     rev    = version;
-    sha256 = "0lqsf4wmg24mb3ksmib8xwvmghx8m2vzrjrs8dazwlmik7rill8i";
+    sha256 = "018sb7p8xlvv8p2fdbnl0v98zh78zc8ha74ldw5c8z0i7xzgzj9w";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/tools/xcbuild/toolchains.nix b/pkgs/development/tools/xcbuild/toolchains.nix
index 59e009a4338..92ff35ac8b5 100644
--- a/pkgs/development/tools/xcbuild/toolchains.nix
+++ b/pkgs/development/tools/xcbuild/toolchains.nix
@@ -67,5 +67,6 @@ runCommand "Toolchains" {} (''
   done
 
   ln -s ${buildPackages.darwin.bootstrap_cmds}/bin/mig $toolchain/bin
+  ln -s ${buildPackages.darwin.bootstrap_cmds}/libexec/migcom $toolchain/libexec
   ln -s ${mkdep-darwin-src} $toolchain/bin/mkdep
 '')
diff --git a/pkgs/development/web/now-cli/default.nix b/pkgs/development/web/now-cli/default.nix
index d512d557033..1c49f99d619 100644
--- a/pkgs/development/web/now-cli/default.nix
+++ b/pkgs/development/web/now-cli/default.nix
@@ -1,12 +1,12 @@
 { stdenv, lib, fetchurl }:
 stdenv.mkDerivation rec {
   name = "now-cli-${version}";
-  version = "13.0.4";
+  version = "13.1.2";
 
   # TODO: switch to building from source, if possible
   src = fetchurl {
     url = "https://github.com/zeit/now-cli/releases/download/${version}/now-linux.gz";
-    sha256 = "0qiykqrdd1yv6n1kzkzp300j32g682rv4p0l39rgnczdaiqcv9w5";
+    sha256 = "0hgbmvhzxkr84ilrzjxnj3p5pkibam739cckpvwalq5q1ddy2cn4";
   };
 
   sourceRoot = ".";
author	Vladimír Čunát <vcunat@gmail.com>	2019-02-01 09:42:53 +0100
committer	Vladimír Čunát <vcunat@gmail.com>	2019-02-01 09:42:53 +0100
commit	8ba516664bf367889b06b06e4122372f82f24feb (patch)
tree	01b691a7e1ad4797843b4c93d8a9d74fd16311d7 /pkgs/development
parent	d00ca4476cd91bae052e8ded4d94e124a353d091 (diff)
parent	5effa4e0f98b317fe4607b1a6548811017c3325d (diff)
download	nixpkgs-8ba516664bf367889b06b06e4122372f82f24feb.tar nixpkgs-8ba516664bf367889b06b06e4122372f82f24feb.tar.gz nixpkgs-8ba516664bf367889b06b06e4122372f82f24feb.tar.bz2 nixpkgs-8ba516664bf367889b06b06e4122372f82f24feb.tar.lz nixpkgs-8ba516664bf367889b06b06e4122372f82f24feb.tar.xz nixpkgs-8ba516664bf367889b06b06e4122372f82f24feb.tar.zst nixpkgs-8ba516664bf367889b06b06e4122372f82f24feb.zip