Merge staging-next into staging

78 files changed, 2496 insertions, 1404 deletions

diff --git a/pkgs/development/compilers/adoptopenjdk-bin/sources.json b/pkgs/development/compilers/adoptopenjdk-bin/sources.json
index 32ace2a817a0..03febb6aa355 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/sources.json
+++ b/pkgs/development/compilers/adoptopenjdk-bin/sources.json
@@ -5,7 +5,7 @@
         "hotspot": {
           "aarch64": {
             "build": "7",
-            "sha256": "ac367f3261fb53508c07f7eeb767b11ab53681b7613b81b6b7030c4db00b1aa8",
+            "sha256": "894a846600ddb0df474350037a2fb43e3343dc3606809a20c65e750580d8f2b9",
             "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.3_7.tar.gz",
             "version": "11.0.3"
           },
@@ -33,7 +33,7 @@
         "hotspot": {
           "aarch64": {
             "build": "7",
-            "sha256": "4af5b7d6678d03f2207029a7c610d81b1f016462c1dfcd8153a227b1df973a42",
+            "sha256": "de31fab70640c6d5099de5fc8fa8b4d6b484a7352fa48a9fafbdc088ca708564",
             "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.3_7.tar.gz",
             "version": "11.0.3"
           },
diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix
index 1cbfa7e65936..e891ff42ff60 100644
--- a/pkgs/development/compilers/ghc/8.6.5.nix
+++ b/pkgs/development/compilers/ghc/8.6.5.nix
@@ -84,12 +84,12 @@ let
 
 in
 stdenv.mkDerivation (rec {
-  version = "8.6.4.20190406";
+  version = "8.6.5";
   name = "${targetPrefix}ghc-${version}";
 
   src = fetchurl {
-    url = "https://downloads.haskell.org/~ghc/8.6.5-rc1/ghc-${version}-src.tar.xz";
-    sha256 = "1zschidlaj80fl9flnlfhvlvy75cks3hz31cfxyyz935m3xyayxv";
+    url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz";
+    sha256 = "0qg3zsmbk4rkwkc3jpas3zs74qaxmw4sp4v1mhsbj0a0dzls2jjd";
   };
 
   enableParallelBuilding = true;
@@ -228,7 +228,7 @@ stdenv.mkDerivation (rec {
     inherit enableShared;
 
     # Our Cabal compiler name
-    haskellCompilerName = "ghc-8.6.4.20190406";
+    haskellCompilerName = "ghc-${version}";
   };
 
   meta = {
diff --git a/pkgs/development/compilers/ghc/8.8.1.nix b/pkgs/development/compilers/ghc/8.8.1.nix
new file mode 100644
index 000000000000..9772d045b765
--- /dev/null
+++ b/pkgs/development/compilers/ghc/8.8.1.nix
@@ -0,0 +1,230 @@
+{ stdenv, pkgsBuildTarget, targetPackages
+
+# build-tools
+, bootPkgs
+, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx
+
+, libiconv ? null, ncurses
+
+, # GHC can be built with system libffi or a bundled one.
+  libffi ? null
+
+, useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform)
+, # LLVM is conceptually a run-time-only depedendency, but for
+  # non-x86, we need LLVM to bootstrap later stages, so it becomes a
+  # build-time dependency too.
+  buildLlvmPackages, llvmPackages
+
+, # If enabled, GHC will be built with the GPL-free but slower integer-simple
+  # library instead of the faster but GPLed integer-gmp library.
+  enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
+
+, # If enabled, use -fPIC when compiling static libs.
+  enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
+
+, # Whether to build dynamic libs for the standard library (on the target
+  # platform). Static libs are always built.
+  enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt
+
+, # Whetherto build terminfo.
+  enableTerminfo ? !stdenv.targetPlatform.isWindows
+
+, # 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"
+
+, # Whether to disable the large address space allocator
+  # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
+  disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64
+}:
+
+assert !enableIntegerSimple -> gmp != null;
+
+let
+  inherit (stdenv) buildPlatform hostPlatform targetPlatform;
+
+  inherit (bootPkgs) ghc;
+
+  # TODO(@Ericson2314) Make unconditional
+  targetPrefix = stdenv.lib.optionalString
+    (targetPlatform != hostPlatform)
+    "${targetPlatform.config}-";
+
+  buildMK = ''
+    BuildFlavour = ${ghcFlavour}
+    ifneq \"\$(BuildFlavour)\" \"\"
+    include mk/flavours/\$(BuildFlavour).mk
+    endif
+    DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
+    INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
+  '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
+    Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
+    CrossCompilePrefix = ${targetPrefix}
+    HADDOCK_DOCS = NO
+    BUILD_SPHINX_HTML = NO
+    BUILD_SPHINX_PDF = NO
+  '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
+    GhcLibHcOpts += -fPIC
+    GhcRtsHcOpts += -fPIC
+  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+    EXTRA_CC_OPTS += -std=gnu99
+  '';
+
+  # Splicer will pull out correct variations
+  libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
+    ++ [libffi]
+    ++ stdenv.lib.optional (!enableIntegerSimple) gmp
+    ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
+
+  toolsForTarget = [
+    pkgsBuildTarget.targetPackages.stdenv.cc
+  ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm;
+
+  targetCC = builtins.head toolsForTarget;
+
+in
+stdenv.mkDerivation (rec {
+  version = "8.8.0.20190424";
+  name = "${targetPrefix}ghc-${version}";
+
+  src = fetchurl {
+    url = "https://downloads.haskell.org/~ghc/8.8.1-alpha1/ghc-${version}-src.tar.xz";
+    sha256 = "1lwzy4q9hhaayamr1ij3lk8l7zdwfqza5b2racylp7xn2y9wanl9";
+  };
+
+  enableParallelBuilding = true;
+
+  outputs = [ "out" "doc" ];
+
+  postPatch = "patchShebangs .";
+
+  # GHC is a bit confused on its cross terminology.
+  preConfigure = ''
+    for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
+      export "''${env#TARGET_}=''${!env}"
+    done
+    # GHC is a bit confused on its cross terminology, as these would normally be
+    # the *host* tools.
+    export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
+    export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
+    # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}"
+    export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
+    export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
+    export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
+    export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
+    export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
+    export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
+
+    echo -n "${buildMK}" > mk/build.mk
+    sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
+  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+    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.
+  configurePlatforms = [ "build" "host" ]
+    ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+  # `--with` flags for libraries needed for RTS linker
+  configureFlags = [
+    "--datadir=$doc/share/doc/ghc"
+    "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
+  ] ++ stdenv.lib.optionals (libffi != null) ["--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.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) [
+    "--enable-bootstrap-with-devel-snapshot"
+  ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [
+    "CFLAGS=-fuse-ld=gold"
+    "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
+    "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
+  ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [
+    "--disable-large-address-space"
+  ];
+
+  # 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 sphinx
+    ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
+  ];
+
+  # For building runtime libs
+  depsBuildTarget = toolsForTarget;
+
+  buildInputs = [ perl ] ++ (libDeps hostPlatform);
+
+  propagatedBuildInputs = [ targetPackages.stdenv.cc ]
+    ++ stdenv.lib.optional useLLVM llvmPackages.llvm;
+
+  depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform);
+  depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform);
+
+  # required, because otherwise all symbols from HSffi.o are stripped, and
+  # that in turn causes GHCi to abort
+  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
+
+  checkTarget = "test";
+
+  hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
+
+  postInstall = ''
+    # Install the bash completion file.
+    install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
+
+    # Patch scripts to include "readelf" and "cat" in $PATH.
+    for i in "$out/bin/"*; do
+      test ! -h $i || continue
+      egrep --quiet '^#!' <(head -n 1 $i) || continue
+      sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
+    done
+  '';
+
+  passthru = {
+    inherit bootPkgs targetPrefix;
+
+    inherit llvmPackages;
+    inherit enableShared;
+
+    # Our Cabal compiler name
+    haskellCompilerName = "ghc-${version}";
+  };
+
+  meta = {
+    homepage = http://haskell.org/ghc;
+    description = "The Glasgow Haskell Compiler";
+    maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
+    inherit (ghc.meta) license platforms;
+  };
+
+} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
+  dontStrip = true;
+  dontPatchELF = true;
+  noAuditTmpdir = true;
+})
diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix
index 62934dd9eeb3..08e3ec4f445f 100644
--- a/pkgs/development/compilers/jetbrains-jdk/default.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/default.nix
@@ -1,19 +1,19 @@
 { stdenv, lib, fetchurl, file, glib, libxml2, libav_0_8, ffmpeg, libxslt
 , libGL , xorg, alsaLib, fontconfig, freetype, pango, gtk2, cairo
-, gdk_pixbuf, atk }:
+, gdk_pixbuf, atk, zlib }:
 
 # TODO: Investigate building from source instead of patching binaries.
 # TODO: Binary patching for not just x86_64-linux but also x86_64-darwin i686-linux
 
 let drv = stdenv.mkDerivation rec {
   pname = "jetbrainsjdk";
-  version = "202b1483.37";
+  version = "164";
   name = pname + "-" + version;
 
   src = if stdenv.hostPlatform.system == "x86_64-linux" then
     fetchurl {
-      url = "https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrsdk8u${version}_linux_x64.tar.gz";
-      sha256 = "12l81g8zhaymh4rzyfl9nyzmpkgzc7wrphm3j4plxx129yn9i7d7";
+      url = "https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrsdk-11_0_2-linux-x64-b${version}.tar.gz";
+      sha256 = "121yzgvkfx7lq0k9s8wjnhz09a564br5y7zlkxgh191sbm2i7zdi";
     }
   else
     throw "unsupported system: ${stdenv.hostPlatform.system}";
@@ -29,16 +29,7 @@ let drv = stdenv.mkDerivation rec {
     jrePath=$out/jre
   '';
 
-  postFixup = let
-    arch = "amd64";
-    rSubPaths = [
-      "lib/${arch}/jli"
-      "lib/${arch}/server"
-      "lib/${arch}/xawt"
-      "lib/${arch}"
-    ];
-    in ''
-    rpath+="''${rpath:+:}${stdenv.lib.concatStringsSep ":" (map (a: "$jrePath/${a}") rSubPaths)}"
+  postFixup = ''
     find $out -type f -perm -0100 \
         -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
         --set-rpath "$rpath" {} \;
@@ -47,10 +38,11 @@ let drv = stdenv.mkDerivation rec {
 
   rpath = lib.makeLibraryPath ([
     stdenv.cc.cc stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL
-    alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk
+    alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk zlib
+    (placeholder "out")
   ] ++ (with xorg; [
     libX11 libXext libXtst libXi libXp libXt libXrender libXxf86vm
-  ]));
+  ])) + ":${placeholder "out"}/lib/jli";
 
   passthru.home = drv;
 
diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index 832954dd67f2..952c5d1bf6ae 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -95,6 +95,9 @@ let
       ./swing-use-gtk-jdk8.patch
     ];
 
+    # Hotspot cares about the host(!) version otherwise
+    DISABLE_HOTSPOT_OS_VERSION_CHECK = "ok";
+
     preConfigure = ''
       chmod +x configure
       substituteInPlace configure --replace /bin/bash "${bash}/bin/bash"
diff --git a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
index 81f4ef3c7dba..d9ee5010f7cf 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
@@ -2,13 +2,13 @@
 # jce download url: http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
 import ./jdk-linux-base.nix {
   productVersion = "8";
-  patchVersion = "201";
-  buildVersion = "09";
-  sha256.i686-linux = "1f9n93zmkggchaxkchp4bqasvxznn96zjci34f52h7v392jkzqac";
-  sha256.x86_64-linux = "0w730v2q0iaxf2lprabwmy7129byrs0hhdbwas575p1xmk00qw6b";
-  sha256.armv7l-linux = "0y6bvq93lsf21v6ca536dpfhkk5ljsj7c6di0qzkban37bivj0si";
-  sha256.aarch64-linux = "1bybysgg9llqzllsmdszmmb73v5az2l1shxn6lxwv3wwiazpf47q";
-  releaseToken = "42970487e3af4f5aa5bca3f542482c60";
+  patchVersion = "211";
+  buildVersion = "12";
+  sha256.i686-linux = "0mdrljs0rw9s4pvaa3sn791nqgdrp8749z3qn80y7hhad74kvsnp";
+  sha256.x86_64-linux = "13b6qk4sn8jdhxa22na9d2aazm4yjh6yxrlxr189gxy3619y9dy0";
+  sha256.armv7l-linux = "1ij1x925k7lyp5f98gy8r0xfr41qhczf2rb74plwwmrccc1k00p5";
+  sha256.aarch64-linux = "041r615qj9qy34a9gxm8968qlmf060ba2as5w97v86mbik4rca05";
+  releaseToken = "478a62b7d4e34b78b671c754eaaf38ab";
   jceName = "jce_policy-8.zip";
   sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
 }
diff --git a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
index 0263bdde8d28..9fab02ab5361 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
@@ -2,13 +2,13 @@
 # jce download url: http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
 import ./jdk-linux-base.nix {
   productVersion = "8";
-  patchVersion = "202";
-  buildVersion = "09";
-  sha256.i686-linux = "19np392dwdqdq39lmm10607w2h042lrm5953fnsfh1bb9jli1pgj";
-  sha256.x86_64-linux = "1q4l8pymjvsvxfwaw0rdcnhryh1la2bvg5f4d4my41ka390k4p4s";
-  sha256.armv7l-linux = "06aljl7dqmmhmp7xswgvkcgh9mam71wnqydg9yb3hkcc443cm581";
-  sha256.aarch64-linux = "12v9ndv7a2c9zqq6ai2vsgwad0lzmf4c6jxy4p9miapmhjzx5vii";
-  releaseToken = "42970487e3af4f5aa5bca3f542482c60";
+  patchVersion = "212";
+  buildVersion = "10";
+  sha256.i686-linux = "03dj9q0bi3ib731f4zl9hylkrgw417h6qlg2wi7nw71b0fqhijn1";
+  sha256.x86_64-linux = "1yzddxzfh6h14bpzis1abp52x4jjljg8a3zyqz483q6qm05caq1i";
+  sha256.armv7l-linux = "0x333alkqdx8mmiirair7g5iiwif5v9ka4j3qr0f42ilvmk8csnx";
+  sha256.aarch64-linux = "0vcbdvcsl8rm47i07s93jmrrs5laibf937d8vacjqqgh9bbhsr2c";
+  releaseToken = "59066701cf1a433da9770636fbc4c9aa";
   jceName = "jce_policy-8.zip";
   sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
 }
diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix
index ee662d39e451..056ad7454600 100644
--- a/pkgs/development/compilers/sbcl/bootstrap.nix
+++ b/pkgs/development/compilers/sbcl/bootstrap.nix
@@ -3,9 +3,9 @@
 let
   options = rec {
     x86_64-darwin = rec {
-      version = "1.1.8";
+      version = "1.2.11";
       system = "x86-64-darwin";
-      sha256 = "006pr88053wclvbjfjdypnbiw8wymbzdzi7a6kbkpdfn4zf5943j";
+      sha256 = "0lh4gpvi8hl6g6b9321g5pwh8sk3218i7h4lx7p3vd9z0cf3lz85";
     };
     x86_64-linux = rec {
       version = "1.3.16";
diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index bca506169889..469d7847409f 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation rec {
   name    = "sbcl-${version}";
-  version = "1.5.0";
+  version = "1.5.1";
 
   src = fetchurl {
     url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-    sha256 = "1a4c84b6qqi4w4l1zzhnhnywk73j3wb0gjgghzcw0h5syqbqzy8z";
+    sha256 = "08z62qba0kmm15k93s2rq7ipi769895g8iwigcp20qjh6amwnwph";
   };
 
   buildInputs = [texinfo];
diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix
index 1aea771e4996..97b4a627540c 100644
--- a/pkgs/development/compilers/swi-prolog/default.nix
+++ b/pkgs/development/compilers/swi-prolog/default.nix
@@ -1,22 +1,30 @@
-{ stdenv, fetchurl, jdk, gmp, readline, openssl, libjpeg, unixODBC, zlib
+{ stdenv, fetchgit, jdk, gmp, readline, openssl, libjpeg, unixODBC, zlib
 , libXinerama, libarchive, db, pcre, libedit, libossp_uuid, libXft, libXpm
 , libSM, libXt, freetype, pkgconfig, fontconfig, makeWrapper ? stdenv.isDarwin
+, git, cacert, cmake, libyaml
+, extraLibraries ? [ jdk unixODBC libXpm libSM libXt freetype fontconfig ]
+, extraPacks     ? []
 }:
 
 let
-  version = "7.6.4";
+  version = "8.1.4";
+  packInstall = swiplPath: pack:
+    ''${swiplPath}/bin/swipl -g "pack_install(${pack}, [package_directory(\"${swiplPath}/lib/swipl/pack\"), silent(true), interactive(false)])." -t "halt."
+    '';
 in
 stdenv.mkDerivation {
   name = "swi-prolog-${version}";
 
-  src = fetchurl {
-    url = "http://www.swi-prolog.org/download/stable/src/swipl-${version}.tar.gz";
-    sha256 = "14bq4sqs61maqpnmgy6687jjj0shwc27cpfsqbf056nrssmplg9d";
+  src = fetchgit {
+    url = "https://github.com/SWI-Prolog/swipl-devel";
+    rev = "V${version}";
+    sha256 = "0qxa6f5dypwczxajlf0l736adbjb17cbak3qsh5g04hpv2bxm6dh";
   };
 
-  buildInputs = [ jdk gmp readline openssl libjpeg unixODBC libXinerama
-    libarchive db pcre libedit libossp_uuid libXft libXpm libSM libXt
-    zlib freetype pkgconfig fontconfig ]
+  buildInputs = [ cacert git cmake gmp readline openssl
+    libarchive libyaml db pcre libedit libossp_uuid
+    zlib pkgconfig ]
+  ++ extraLibraries
   ++ stdenv.lib.optional stdenv.isDarwin makeWrapper;
 
   hardeningDisable = [ "format" ];
@@ -27,7 +35,20 @@ stdenv.mkDerivation {
     "--enable-shared"
   ];
 
-  buildFlags = "world";
+  installPhase = ''
+    mkdir -p $out
+    mkdir build
+    cd build
+    ${cmake}/bin/cmake -DCMAKE_INSTALL_PREFIX=$out ..
+    cd ../
+    make
+    make install
+    make clean
+    mkdir -p $out/lib/swipl/pack
+  ''
+  + builtins.concatStringsSep "\n"
+  ( builtins.map (packInstall "$out") extraPacks
+  );
 
   # For macOS: still not fixed in upstream: "abort trap 6" when called
   # through symlink, so wrap binary.
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 46230a532f05..783edb599f76 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1282,4 +1282,10 @@ self: super: {
   # Break out of pandoc >=2.0 && <2.7 (https://github.com/pbrisbin/yesod-markdown/pull/65)
   yesod-markdown = doJailbreak super.yesod-markdown;
 
+  # These packages needs network 3.x, which is not in LTS-13.x.
+  network-bsd = super.network-bsd.override { network = self.network_3_0_1_1; };
+  lambdabot-core = super.lambdabot-core.overrideScope (self: super: { network = self.network_3_0_1_1; hslogger = self.hslogger_1_3_0_0; });
+  lambdabot-reference-plugins = super.lambdabot-reference-plugins.overrideScope (self: super: { network = self.network_3_0_1_1; hslogger = self.hslogger_1_3_0_0; });
+  lambdabot-haskell-plugins = super.lambdabot-haskell-plugins.overrideScope (self: super: { network = self.network_3_0_1_1; socks = self.socks_0_6_0; connection = self.connection_0_3_0; haskell-src-exts = self.haskell-src-exts_1_21_0; });
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
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 b5fe837cec57..8d0582a8d067 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -4,8 +4,8 @@ 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.6.x core libraries.
   array = null;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
new file mode 100644
index 000000000000..2b58e5ce5e23
--- /dev/null
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -0,0 +1,58 @@
+{ pkgs, haskellLib }:
+
+with haskellLib;
+
+self: super: {
+
+  # This compiler version needs llvm 7.x.
+  llvmPackages = pkgs.llvmPackages_7;
+
+  # Disable GHC 8.8.x core libraries.
+  array = null;
+  base = null;
+  binary = null;
+  bytestring = null;
+  Cabal = null;
+  containers = null;
+  deepseq = null;
+  directory = null;
+  filepath = null;
+  ghc-boot = null;
+  ghc-boot-th = null;
+  ghc-compact = null;
+  ghc-heap = null;
+  ghc-prim = null;
+  ghci = null;
+  haskeline = null;
+  hpc = null;
+  integer-gmp = null;
+  libiserv = null;
+  mtl = null;
+  parsec = null;
+  pretty = null;
+  process = null;
+  rts = null;
+  stm = null;
+  template-haskell = null;
+  terminfo = null;
+  text = null;
+  time = null;
+  transformers = null;
+  unix = null;
+  xhtml = null;
+
+  # Ignore overly restrictive upper version bounds.
+  doctest = doJailbreak super.doctest;
+
+  # These packages don't work and need patching and/or an update.
+  primitive = overrideSrc (doJailbreak super.primitive) {
+    version = "20180530-git";
+    src = pkgs.fetchFromGitHub {
+      owner = "haskell";
+      repo = "primitive";
+      rev = "97964182881aa0419546e0bb188b2d17e4468324";
+      sha256 = "1p1pinca33vd10iy7hl20c1fc99vharcgcai6z3ngqbq50k2pd3q";
+    };
+  };
+
+}
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index f8a5c0bb5737..0795ca0f7238 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -1,6 +1,6 @@
 # pkgs/development/haskell-modules/configuration-hackage2nix.yaml
 
-compiler: ghc-8.6.4
+compiler: ghc-8.6.5
 
 core-packages:
   - array-0.5.3.0
@@ -12,13 +12,13 @@ core-packages:
   - deepseq-1.4.4.0
   - directory-1.3.3.0
   - filepath-1.4.2.1
-  - ghc-8.6.4
-  - ghc-boot-8.6.4
-  - ghc-boot-th-8.6.4
+  - ghc-8.6.5
+  - ghc-boot-8.6.5
+  - ghc-boot-th-8.6.5
   - ghc-compact-0.1.0.0
-  - ghc-heap-8.6.4
+  - ghc-heap-8.6.5
   - ghc-prim-0.5.3
-  - ghci-8.6.4
+  - ghci-8.6.5
   - haskeline-0.7.4.3
   - hpc-0.6.0.3
   - integer-gmp-1.0.2.0
@@ -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.18
+  # LTS Haskell 13.19
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -179,7 +179,7 @@ default-package-overrides:
   - amazonka-waf ==1.6.1
   - amazonka-workspaces ==1.6.1
   - amazonka-xray ==1.6.1
-  - amqp ==0.18.1
+  - amqp ==0.18.2
   - annotated-wl-pprint ==0.7.0
   - ansi-terminal ==0.8.2
   - ansi-wl-pprint ==0.6.8.2
@@ -269,7 +269,7 @@ default-package-overrides:
   - bencode ==0.6.0.0
   - between ==0.11.0.0
   - bibtex ==0.1.0.6
-  - bifunctors ==5.5.3
+  - bifunctors ==5.5.4
   - bimap ==0.3.3
   - bimap-server ==0.1.0.1
   - binary-bits ==0.5
@@ -316,7 +316,7 @@ default-package-overrides:
   - boolean-normal-forms ==0.0.1
   - boolsimplifier ==0.1.8
   - bordacount ==0.1.0.0
-  - boring ==0.1
+  - boring ==0.1.1
   - both ==0.1.1.0
   - bound ==2.0.1
   - BoundedChan ==1.0.3.0
@@ -563,7 +563,7 @@ default-package-overrides:
   - DAV ==1.3.3
   - dbcleaner ==0.1.3
   - DBFunctor ==0.1.1.1
-  - dbus ==1.2.5
+  - dbus ==1.2.6
   - debian-build ==0.10.1.2
   - debug ==0.1.1
   - debug-trace-var ==0.2.0
@@ -579,7 +579,7 @@ default-package-overrides:
   - dependent-sum-template ==0.0.0.6
   - deque ==0.2.7
   - deriveJsonNoPrefix ==0.1.0.1
-  - deriving-compat ==0.5.4
+  - deriving-compat ==0.5.5
   - derulo ==1.0.5
   - detour-via-sci ==1.0.0
   - dhall ==1.19.1
@@ -651,7 +651,7 @@ default-package-overrides:
   - ekg-statsd ==0.2.4.0
   - elerea ==2.9.0
   - elf ==0.29
-  - eliminators ==0.5
+  - eliminators ==0.5.1
   - elm2nix ==0.1.1
   - elm-core-sources ==1.0.0
   - elm-export ==0.6.0.1
@@ -698,7 +698,7 @@ default-package-overrides:
   - explicit-exception ==0.1.9.2
   - exp-pairs ==0.2.0.0
   - extensible-exceptions ==0.1.1.4
-  - extra ==1.6.14
+  - extra ==1.6.15
   - extractable-singleton ==0.0.1
   - extrapolate ==0.3.3
   - fail ==4.9.0.0
@@ -725,7 +725,7 @@ default-package-overrides:
   - fileplow ==0.1.0.0
   - filter-logger ==0.6.0.0
   - filtrable ==0.1.1.0
-  - fin ==0.0.1
+  - fin ==0.0.2
   - FindBin ==0.0.5
   - fingertree ==0.1.4.2
   - finite-typelits ==0.1.4.2
@@ -788,7 +788,7 @@ default-package-overrides:
   - general-games ==1.1.1
   - generic-arbitrary ==0.1.0
   - generic-data ==0.3.0.0
-  - generic-deriving ==1.12.3
+  - generic-deriving ==1.12.4
   - generic-lens ==1.1.0.0
   - GenericPretty ==1.2.2
   - generic-random ==1.2.0.0
@@ -896,7 +896,7 @@ default-package-overrides:
   - HandsomeSoup ==0.4.2
   - hapistrano ==0.3.9.2
   - happy ==1.19.9
-  - hasbolt ==0.1.3.2
+  - hasbolt ==0.1.3.3
   - hashable ==1.2.7.0
   - hashable-time ==0.2.0.2
   - hashids ==1.0.2.4
@@ -918,9 +918,9 @@ default-package-overrides:
   - haskell-src-meta ==0.8.2
   - haskey-btree ==0.3.0.0
   - haskoin-core ==0.8.4
-  - hasql ==1.3.0.3
+  - hasql ==1.3.0.5
   - hasql-optparse-applicative ==0.3.0.3
-  - hasql-pool ==0.5.0.1
+  - hasql-pool ==0.5.0.2
   - hasql-transaction ==0.7.1
   - hasty-hamiltonian ==1.3.2
   - haxl ==2.0.1.1
@@ -963,7 +963,7 @@ default-package-overrides:
   - hmatrix-gsl ==0.19.0.1
   - hmatrix-gsl-stats ==0.4.1.7
   - hmatrix-morpheus ==0.1.1.2
-  - hmatrix-vector-sized ==0.1.1.2
+  - hmatrix-vector-sized ==0.1.1.3
   - hmpfr ==0.4.4
   - hoauth2 ==1.8.4
   - Hoed ==0.5.1
@@ -1130,7 +1130,7 @@ default-package-overrides:
   - IntervalMap ==0.6.1.1
   - intervals ==0.8.1
   - intset-imperative ==0.1.0.0
-  - invariant ==0.5.1
+  - invariant ==0.5.2
   - invertible ==0.2.0.5
   - io-choice ==0.0.7
   - io-machine ==0.2.0.0
@@ -1212,7 +1212,7 @@ default-package-overrides:
   - leancheck ==0.8.0
   - leancheck-instances ==0.0.3
   - leapseconds-announced ==2017.1.0.1
-  - lens ==4.17
+  - lens ==4.17.1
   - lens-action ==0.2.3
   - lens-aeson ==1.0.2
   - lens-datetime ==0.3
@@ -1264,7 +1264,7 @@ default-package-overrides:
   - long-double ==0.1
   - loop ==0.3.0
   - lrucaching ==0.3.3
-  - lsp-test ==0.5.1.1
+  - lsp-test ==0.5.1.2
   - lucid ==2.9.11
   - lucid-extras ==0.1.0.1
   - lxd-client-config ==0.1.0.1
@@ -1414,7 +1414,7 @@ default-package-overrides:
   - netwire ==5.0.3
   - netwire-input ==0.0.7
   - netwire-input-glfw ==0.0.10
-  - network ==2.8.0.0
+  - network ==2.8.0.1
   - network-anonymous-i2p ==0.10.0
   - network-anonymous-tor ==0.11.0
   - network-attoparsec ==0.12.2
@@ -1485,7 +1485,7 @@ default-package-overrides:
   - options ==1.2.1.1
   - optparse-applicative ==0.14.3.0
   - optparse-generic ==1.3.0
-  - optparse-simple ==0.1.1.1
+  - optparse-simple ==0.1.1.2
   - optparse-text ==0.1.1.0
   - overhang ==1.0.0
   - packcheck ==0.4.1
@@ -1574,13 +1574,13 @@ default-package-overrides:
   - polynomials-bernstein ==1.1.2
   - polyparse ==1.12.1
   - pooled-io ==0.0.2.2
-  - port-utils ==0.2.0.0
+  - port-utils ==0.2.1.0
   - posix-paths ==0.2.1.6
   - possibly ==1.0.0.0
   - postgresql-binary ==0.12.1.2
   - postgresql-libpq ==0.9.4.2
   - postgresql-schema ==0.1.14
-  - postgresql-simple ==0.6.1
+  - postgresql-simple ==0.6.2
   - postgresql-simple-migration ==0.1.14.0
   - postgresql-simple-queue ==1.0.1
   - postgresql-simple-url ==0.2.1.0
@@ -1650,6 +1650,7 @@ default-package-overrides:
   - QuickCheck ==2.12.6.1
   - quickcheck-arbitrary-adt ==0.3.1.0
   - quickcheck-assertions ==0.3.0
+  - quickcheck-classes ==0.6.0.0
   - quickcheck-instances ==0.3.19
   - quickcheck-io ==0.2.0
   - quickcheck-simple ==0.1.0.4
@@ -1687,7 +1688,7 @@ default-package-overrides:
   - rebase ==1.3.1
   - record-dot-preprocessor ==0.1.5
   - records-sop ==0.1.0.2
-  - recursion-schemes ==5.1.2
+  - recursion-schemes ==5.1.3
   - reducers ==3.12.3
   - refact ==0.3.0.2
   - references ==0.3.3.1
@@ -1825,7 +1826,7 @@ default-package-overrides:
   - servant-tracing ==0.1.0.2
   - servant-websockets ==1.1.0
   - servant-yaml ==0.1.0.1
-  - serverless-haskell ==0.8.6
+  - serverless-haskell ==0.8.7
   - serversession ==1.0.1
   - serversession-frontend-wai ==1.0
   - servius ==1.2.3.0
@@ -1921,7 +1922,7 @@ default-package-overrides:
   - storable-record ==0.0.4
   - storable-tuple ==0.0.3.3
   - storablevector ==0.2.13
-  - store ==0.5.0.1
+  - store ==0.5.1.0
   - store-core ==0.4.4
   - Strafunski-StrategyLib ==5.0.1.0
   - stratosphere ==0.29.1
@@ -2052,13 +2053,13 @@ default-package-overrides:
   - threads ==0.5.1.6
   - threepenny-gui ==0.8.3.0
   - th-reify-compat ==0.0.1.5
-  - th-reify-many ==0.1.8
+  - th-reify-many ==0.1.9
   - throttle-io-stream ==0.2.0.1
   - throwable-exceptions ==0.1.0.9
   - th-strict-compat ==0.1.0.1
   - th-utilities ==0.2.1.0
   - thyme ==0.3.5.5
-  - tidal ==1.0.11
+  - tidal ==1.0.13
   - tile ==0.3.0.0
   - time-compat ==0.1.0.3
   - timeit ==2.0
@@ -2066,7 +2067,7 @@ default-package-overrides:
   - time-lens ==0.4.0.2
   - time-locale-compat ==0.1.1.5
   - time-locale-vietnamese ==1.0.0.0
-  - time-parsers ==0.1.2.0
+  - time-parsers ==0.1.2.1
   - time-qq ==0.0.1.0
   - timerep ==2.0.0.2
   - timer-wheel ==0.1.0
@@ -2080,7 +2081,7 @@ default-package-overrides:
   - tls-session-manager ==0.0.0.2
   - tmapchan ==0.0.3
   - tmapmvar ==0.0.4
-  - tmp-postgres ==0.1.1.1
+  - tmp-postgres ==0.1.2.2
   - token-bucket ==0.1.0.1
   - tomland ==0.5.0
   - tostring ==0.2.1.1
@@ -2180,7 +2181,7 @@ default-package-overrides:
   - validity-vector ==0.2.0.2
   - valor ==0.1.0.0
   - vault ==0.3.1.2
-  - vec ==0.1
+  - vec ==0.1.1
   - vector ==0.12.0.2
   - vector-algorithms ==0.8.0.1
   - vector-binary-instances ==0.2.5.1
@@ -2223,9 +2224,9 @@ default-package-overrides:
   - wai-slack-middleware ==0.2.0
   - wai-transformers ==0.1.0
   - wai-websockets ==3.0.1.2
-  - warp ==3.2.26
-  - warp-tls ==3.2.4.3
-  - warp-tls-uid ==0.2.0.5
+  - warp ==3.2.27
+  - warp-tls ==3.2.5
+  - warp-tls-uid ==0.2.0.6
   - wave ==0.1.5
   - wcwidth ==0.0.2
   - web3 ==0.8.3.1
@@ -2309,7 +2310,7 @@ default-package-overrides:
   - yesod ==1.6.0
   - yesod-alerts ==0.1.2.0
   - yesod-auth ==1.6.6
-  - yesod-auth-hashdb ==1.7.1
+  - yesod-auth-hashdb ==1.7.1.1
   - yesod-auth-oauth2 ==0.6.1.1
   - yesod-bin ==1.6.0.3
   - yesod-core ==1.6.14
@@ -2322,8 +2323,8 @@ default-package-overrides:
   - yesod-gitrev ==0.2.1
   - yesod-markdown ==0.12.6.1
   - yesod-newsfeed ==1.6.1.0
-  - yesod-paginator ==1.1.0.1
-  - yesod-persistent ==1.6.0.1
+  - yesod-paginator ==1.1.0.2
+  - yesod-persistent ==1.6.0.2
   - yesod-recaptcha2 ==0.3.0
   - yesod-sitemap ==1.6.0
   - yesod-static ==1.6.0.1
@@ -2341,7 +2342,7 @@ default-package-overrides:
   - zeromq4-patterns ==0.3.1.0
   - zim-parser ==0.2.1.0
   - zip ==1.2.0
-  - zip-archive ==0.4
+  - zip-archive ==0.4.1
   - zippers ==0.2.5
   - zip-stream ==0.2.0.1
   - zlib ==0.6.2
@@ -2391,13 +2392,15 @@ extra-packages:
   - mtl < 2.2                           # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x
   - mtl-prelude < 2                     # required for to build postgrest on mtl 2.1.x platforms
   - network == 2.6.3.1                  # newer versions don't compile with GHC 7.4.x and below
+  - network == 3.0.*                    # required by network-bsd, HTTP, and many others (2019-04-30)
   - parallel == 3.2.0.3                 # newer versions don't work with GHC 6.12.3
+  - patience ^>= 0.1                    # required by chell-0.4.x
   - persistent >=2.5 && <2.8            # pre-lts-11.x versions neeed by git-annex 6.20180227
   - persistent-sqlite < 2.7             # pre-lts-11.x versions neeed by git-annex 6.20180227
   - primitive == 0.5.1.*                # required to build alex with GHC 6.12.3
   - proto-lens == 0.2.*                 # required for tensorflow-proto-0.1.x on GHC 8.2.x
-  - proto-lens-protoc == 0.2.*          # required for tensorflow-proto-0.1.x on GHC 8.2.x
   - proto-lens-protobuf-types == 0.2.*  # required for tensorflow-proto-0.1.x on GHC 8.2.x
+  - proto-lens-protoc == 0.2.*          # required for tensorflow-proto-0.1.x on GHC 8.2.x
   - QuickCheck < 2                      # required by test-framework-quickcheck and its users
   - resourcet ==1.1.*                   # pre-lts-11.x versions neeed by git-annex 6.20180227
   - seqid < 0.2                         # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
@@ -2413,7 +2416,6 @@ extra-packages:
   - yesod-persistent < 1.5              # pre-lts-11.x versions neeed by git-annex 6.20180227
   - yesod-static ^>= 1.5                # pre-lts-11.x versions neeed by git-annex 6.20180227
   - yesod-test ^>= 1.5                  # pre-lts-11.x versions neeed by git-annex 6.20180227
-  - patience ^>= 0.1                    # required by chell-0.4.x
 
 package-maintainers:
   peti:
@@ -2599,7 +2601,7 @@ dont-distribute-packages:
   - XML
 
 broken-packages:
-  # these packages don't compile
+  # These packages don't compile or depend on packages that don't compile.
   - 3dmodels
   - 4Blocks
   - a50
@@ -3173,6 +3175,7 @@ broken-packages:
   - blockhash
   - Blogdown
   - blogination
+  - BlogLiterately-diagrams
   - bloodhound
   - bloodhound-amazonka-auth
   - bloomfilter-redis
@@ -3228,6 +3231,9 @@ broken-packages:
   - brok
   - broker-haskell
   - bronyradiogermany-streaming
+  - brotli
+  - brotli-conduit
+  - brotli-streams
   - browscap
   - bson-generic
   - bson-generics
@@ -3278,6 +3284,7 @@ broken-packages:
   - c2hsc
   - cabal-audit
   - cabal-bundle-clib
+  - cabal-cache
   - cabal-cargs
   - cabal-constraints
   - cabal-db
@@ -4020,9 +4027,11 @@ broken-packages:
   - dia-base
   - dia-functions
   - diagrams-boolean
+  - diagrams-builder
   - diagrams-canvas
   - diagrams-graphviz
   - diagrams-gtk
+  - diagrams-haddock
   - diagrams-hsqml
   - diagrams-html5
   - diagrams-pandoc
@@ -4600,6 +4609,7 @@ broken-packages:
   - frag
   - Frames-beam
   - Frames-dsv
+  - Frames-map-reduce
   - franchise
   - Frank
   - freddy
@@ -4731,6 +4741,7 @@ broken-packages:
   - generic-tree
   - generic-xml
   - generic-xmlpickler
+  - generics-eot
   - genericserialize
   - genesis
   - genesis-test
@@ -5232,6 +5243,7 @@ broken-packages:
   - haskell-src-exts-prisms
   - haskell-src-exts-qq
   - haskell-src-exts-sc
+  - haskell-src-exts-simple
   - haskell-src-meta-mwotton
   - haskell-stack-trace-plugin
   - haskell-token-utils
@@ -5567,6 +5579,7 @@ broken-packages:
   - HLearn-datastructures
   - HLearn-distributions
   - hledger-chart
+  - hledger-flow
   - hledger-irr
   - hledger-vty
   - hlibBladeRF
@@ -5717,6 +5730,7 @@ broken-packages:
   - HROOT-math
   - HROOT-tree
   - hs-blake2
+  - hs-brotli
   - hs-carbon-examples
   - hs-cdb
   - hs-conllu
@@ -6056,6 +6070,7 @@ broken-packages:
   - ihaskell-diagrams
   - ihaskell-display
   - ihaskell-gnuplot
+  - ihaskell-graphviz
   - ihaskell-hatex
   - ihaskell-hvega
   - ihaskell-inline-r
@@ -6361,6 +6376,7 @@ broken-packages:
   - kmp-dfa
   - knead
   - knead-arithmetic
+  - knit-haskell
   - knots
   - koellner-phonetic
   - korfu
@@ -6527,6 +6543,7 @@ broken-packages:
   - libconfig
   - libcspm
   - libexpect
+  - libffi-dynamic
   - libGenI
   - libhbb
   - libinfluxdb
@@ -6767,6 +6784,7 @@ broken-packages:
   - manifolds
   - manifolds-core
   - map-exts
+  - map-reduce-folds
   - map-syntax
   - Mapping
   - mappy
@@ -7174,7 +7192,6 @@ broken-packages:
   - netwire-vinylglfw-examples
   - network-address
   - network-anonymous-i2p
-  - network-bsd
   - network-builder
   - network-bytestring
   - network-connection
@@ -7584,6 +7601,7 @@ broken-packages:
   - pipes-async
   - pipes-attoparsec-streaming
   - pipes-bgzf
+  - pipes-brotli
   - pipes-cacophony
   - pipes-cereal
   - pipes-cereal-plus
@@ -7661,6 +7679,7 @@ broken-packages:
   - polh-lexicon
   - polimorf
   - Pollutocracy
+  - poly
   - poly-control
   - polydata
   - polydata-core
@@ -7797,6 +7816,7 @@ broken-packages:
   - proteome
   - proto-lens-combinators
   - proto-lens-descriptors
+  - proto3-suite
   - protobuf-native
   - protocol-buffers-descriptor-fork
   - protocol-buffers-fork
@@ -7833,6 +7853,7 @@ broken-packages:
   - purescript-iso
   - purescript-tsd-gen
   - push-notify
+  - push-notify-apn
   - push-notify-ccs
   - push-notify-general
   - pusher-haskell
@@ -8295,6 +8316,7 @@ broken-packages:
   - scenegraph
   - schedevr
   - schedule-planner
+  - scheduler
   - schedyield
   - schematic
   - scholdoc
@@ -8865,10 +8887,12 @@ broken-packages:
   - streamdeck
   - streamed
   - streaming-benchmarks
+  - streaming-brotli
   - streaming-cassava
   - streaming-concurrency
   - streaming-conduit
   - streaming-fft
+  - streaming-lzma
   - streaming-osm
   - streaming-pcap
   - streaming-png
@@ -9029,6 +9053,7 @@ broken-packages:
   - tasty-jenkins-xml
   - tasty-laws
   - tasty-lens
+  - tasty-quickcheck-laws
   - tasty-stats
   - tasty-tap
   - tasty-travis
@@ -9209,6 +9234,7 @@ broken-packages:
   - tkhs
   - tkyprof
   - tls-extra
+  - tmp-postgres
   - tn
   - to-haskell
   - to-string-class
@@ -9417,6 +9443,7 @@ broken-packages:
   - unity-testresult-parser
   - unitym-yesod
   - universe
+  - universe-dependent-sum
   - universe-instances-extended
   - universe-th
   - universum
@@ -9528,6 +9555,7 @@ broken-packages:
   - vector-bytestring
   - vector-clock
   - vector-conduit
+  - vector-endian
   - vector-extras
   - vector-functorlazy
   - vector-heterogenous
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 1035064f90ea..e13edb352684 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -2009,6 +2009,8 @@ self: {
        executableHaskellDepends = [ base BlogLiterately ];
        description = "Include images in blog posts with inline diagrams code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Blogdown" = callPackage
@@ -6230,6 +6232,8 @@ self: {
        executableHaskellDepends = [ base foldl Frames random text vinyl ];
        description = "Frames wrapper for map-reduce-folds and some extra folds helpers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Frank" = callPackage
@@ -9125,20 +9129,20 @@ self: {
 
   "HTab" = callPackage
     ({ mkDerivation, base, cmdargs, containers, deepseq, hylolib, mtl
-     , strict
+     , random, strict
      }:
      mkDerivation {
        pname = "HTab";
-       version = "1.6.3";
-       sha256 = "0c0igscng6gqhabmvvgappsbzbhkpybcx7vr8yd72pqh988ml4zv";
+       version = "1.7.2";
+       sha256 = "1xn2ljw97j625l5q7a9chqscdbi4cj29zg1yy4jz4mcivzwbjqii";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [
-         base cmdargs containers deepseq hylolib mtl strict
+         base cmdargs containers deepseq hylolib mtl random strict
        ];
        description = "Tableau based theorem prover for hybrid logics";
-       license = "GPL";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
      }) {};
@@ -15875,8 +15879,8 @@ self: {
     ({ mkDerivation, base, containers, QuickCheck }:
      mkDerivation {
        pname = "QuickCheck-safe";
-       version = "0.1.0.5";
-       sha256 = "0l8wp2np4mlbybzwcz8g4r9d8c65yljnvizs3g1rvig4b65j283l";
+       version = "0.1.0.6";
+       sha256 = "1f868s6iq66m4m305xrx3mfw46zvzaahkvz6xjlqzk0cragai1kp";
        libraryHaskellDepends = [ base containers QuickCheck ];
        description = "Safe reimplementation of QuickCheck's core";
        license = stdenv.lib.licenses.mit;
@@ -19665,25 +19669,26 @@ self: {
      }) {};
 
   "Villefort" = callPackage
-    ({ mkDerivation, base, bytestring, concurrent-extra, convertible
-     , directory, filepath, HDBC, HDBC-sqlite3, hspec, MissingH, mtl
-     , process, QuickCheck, random, scotty, split, strict, text, time
-     , transformers, unbounded-delays, unix, uri-encode, webdriver
+    ({ mkDerivation, aeson, base, bytestring, concurrent-extra
+     , convertible, directory, filepath, HDBC, HDBC-sqlite3, hspec
+     , MissingH, mtl, process, QuickCheck, random, scotty, split, strict
+     , text, time, transformers, unbounded-delays, unix, uri-encode
+     , webdriver
      }:
      mkDerivation {
        pname = "Villefort";
-       version = "0.1.2.17";
-       sha256 = "17ga54kclbcr6vpiy6q5yws9535j9sg6isqggx05kz3hsa7nllbz";
+       version = "0.1.2.19";
+       sha256 = "1n6371yvlb39dzi4apcb4am2cyqpm26c2d258idyii4v7s5j0rq0";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         base bytestring convertible directory filepath HDBC HDBC-sqlite3
-         MissingH mtl process random scotty split strict text time
-         transformers unix uri-encode
+         aeson base bytestring convertible directory filepath HDBC
+         HDBC-sqlite3 MissingH mtl process random scotty split strict text
+         time transformers unix uri-encode
        ];
        executableHaskellDepends = [
-         base HDBC HDBC-sqlite3 mtl random scotty split text time
+         base HDBC HDBC-sqlite3 random scotty split text time
        ];
        testHaskellDepends = [
          base concurrent-extra HDBC HDBC-sqlite3 hspec mtl QuickCheck
@@ -21160,6 +21165,8 @@ self: {
        pname = "accelerate-bignum";
        version = "0.2.0.0";
        sha256 = "0xhnd39fb17kb7q5z9z8svn8zlv6j1wxrbkv3vij4f1q2hkqkl0p";
+       revision = "1";
+       editedCabalFile = "0lfsmhky8shyy9xhm0j2as91vrmqqrrn9r0fsv2ljc4xjklg723r";
        libraryHaskellDepends = [
          accelerate accelerate-llvm accelerate-llvm-native
          accelerate-llvm-ptx base ghc-prim llvm-hs-pure template-haskell
@@ -21328,6 +21335,8 @@ self: {
        pname = "accelerate-fft";
        version = "1.2.0.0";
        sha256 = "19p9d59vdd3nq97xjprlb6fz2ajlk6gl37cdyvrm9inag4nnk6lp";
+       revision = "2";
+       editedCabalFile = "096vhbwbkyvjx8znjqnb3lz43kzqq0x7kcfv1gmmbjjrcmwaj2y5";
        libraryHaskellDepends = [
          accelerate accelerate-llvm accelerate-llvm-native
          accelerate-llvm-ptx base bytestring carray containers cuda cufft
@@ -21436,8 +21445,8 @@ self: {
      }:
      mkDerivation {
        pname = "accelerate-llvm";
-       version = "1.2.0.0";
-       sha256 = "110zfxqi0lkhg7pk42qvd87qn442r6z264zj7q46jf8ia60l2cdq";
+       version = "1.2.0.1";
+       sha256 = "1cv5s7fgkdd3m95vy2rrq2kvzyzxx6vwgsc5nqcmfdp00z8znjhk";
        libraryHaskellDepends = [
          abstract-deque accelerate base bytestring chaselev-deque containers
          data-default-class deepseq directory dlist exceptions filepath
@@ -21453,17 +21462,18 @@ self: {
   "accelerate-llvm-native" = callPackage
     ({ mkDerivation, accelerate, accelerate-llvm, base, bytestring
      , c2hs, Cabal, cereal, containers, directory, dlist, filepath, ghc
-     , ghc-prim, hashable, libffi, llvm-hs, llvm-hs-pure, mtl
-     , template-haskell, time, unique, unix, vector
+     , ghc-prim, hashable, libffi, llvm-hs, llvm-hs-pure, lockfree-queue
+     , mtl, template-haskell, time, unique, unix, vector
      }:
      mkDerivation {
        pname = "accelerate-llvm-native";
-       version = "1.2.0.0";
-       sha256 = "089j8ic6ns6656a55byiilrj9jvs535jvx4f2m8x1qhgz9q968vb";
+       version = "1.2.0.1";
+       sha256 = "0sml5rj3dnxlv14i4xbs1sadnprjga1iws7fl7sxkyjzxqc04vrj";
        libraryHaskellDepends = [
          accelerate accelerate-llvm base bytestring Cabal cereal containers
          directory dlist filepath ghc ghc-prim hashable libffi llvm-hs
-         llvm-hs-pure mtl template-haskell time unique unix vector
+         llvm-hs-pure lockfree-queue mtl template-haskell time unique unix
+         vector
        ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ accelerate base ];
@@ -21481,10 +21491,8 @@ self: {
      }:
      mkDerivation {
        pname = "accelerate-llvm-ptx";
-       version = "1.2.0.0";
-       sha256 = "1rh0kq10mwn4zd8f5sp19pah2hmmcansaqqssz79183znzfiviz5";
-       revision = "1";
-       editedCabalFile = "1fcgs1wcknqnj7wr907ixwlrzwgfnl1bmyr5j4d58bm2xrspid7m";
+       version = "1.2.0.1";
+       sha256 = "0c9hl19v4si0lnah4l63kqhpxz16zy0wi3cg28gz00mxzgqilivs";
        libraryHaskellDepends = [
          accelerate accelerate-llvm base bytestring containers cuda deepseq
          directory dlist file-embed filepath hashable llvm-hs llvm-hs-pure
@@ -22861,6 +22869,39 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "aeson_1_4_3_0" = callPackage
+    ({ mkDerivation, attoparsec, base, base-compat, base-orphans
+     , base16-bytestring, bytestring, containers, deepseq, Diff
+     , directory, dlist, filepath, generic-deriving, ghc-prim, hashable
+     , hashable-time, integer-logarithms, primitive, QuickCheck
+     , quickcheck-instances, scientific, tagged, tasty, tasty-golden
+     , tasty-hunit, tasty-quickcheck, template-haskell, text
+     , th-abstraction, time, time-locale-compat, unordered-containers
+     , uuid-types, vector
+     }:
+     mkDerivation {
+       pname = "aeson";
+       version = "1.4.3.0";
+       sha256 = "068caag4pfn9cmmdksv5yxblzffs0nws8vvhzk54pk99nh7sqr35";
+       libraryHaskellDepends = [
+         attoparsec base base-compat bytestring containers deepseq dlist
+         ghc-prim hashable primitive scientific tagged template-haskell text
+         th-abstraction time time-locale-compat unordered-containers
+         uuid-types vector
+       ];
+       testHaskellDepends = [
+         attoparsec base base-compat base-orphans base16-bytestring
+         bytestring containers Diff directory dlist filepath
+         generic-deriving ghc-prim hashable hashable-time integer-logarithms
+         QuickCheck quickcheck-instances scientific tagged tasty
+         tasty-golden tasty-hunit tasty-quickcheck template-haskell text
+         time time-locale-compat unordered-containers uuid-types vector
+       ];
+       description = "Fast JSON parsing and encoding";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "aeson-applicative" = callPackage
     ({ mkDerivation, aeson, base, text, unordered-containers }:
      mkDerivation {
@@ -27627,33 +27668,6 @@ self: {
      }:
      mkDerivation {
        pname = "amqp";
-       version = "0.18.1";
-       sha256 = "0j728d7q013gcqv0m6vpm401hnpbmzzb3i6br8kpxybdjzmy4y26";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base binary bytestring clock connection containers
-         data-binary-ieee754 monad-control network network-uri split stm
-         text vector
-       ];
-       executableHaskellDepends = [ base containers xml ];
-       testHaskellDepends = [
-         base binary bytestring clock connection containers
-         data-binary-ieee754 hspec hspec-expectations network network-uri
-         split stm text vector
-       ];
-       description = "Client library for AMQP servers (currently only RabbitMQ)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "amqp_0_18_2" = callPackage
-    ({ mkDerivation, base, binary, bytestring, clock, connection
-     , containers, data-binary-ieee754, hspec, hspec-expectations
-     , monad-control, network, network-uri, split, stm, text, vector
-     , xml
-     }:
-     mkDerivation {
-       pname = "amqp";
        version = "0.18.2";
        sha256 = "0sp7c9vbgaxc5rhfc402q52djr0qpqgmfklhcrx45av2rqymkyxv";
        isLibrary = true;
@@ -27671,7 +27685,6 @@ self: {
        ];
        description = "Client library for AMQP servers (currently only RabbitMQ)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amqp-conduit" = callPackage
@@ -30183,15 +30196,15 @@ self: {
      }) {debian-mirror = null; help = null;};
 
   "archive-sig" = callPackage
-    ({ mkDerivation, base, bytestring, composition-prelude, directory
-     , filepath
+    ({ mkDerivation, base, bytestring, composition-prelude
+     , dir-traverse
      }:
      mkDerivation {
        pname = "archive-sig";
-       version = "0.2.0.0";
-       sha256 = "1imbailszvxahmhxg9g0qrygi6433gmyg5pby3zq9k5gcc16mmy2";
+       version = "0.2.0.1";
+       sha256 = "1x7kpyxfhn4i9c9wrxwda53qyj4jgw9vd3wfrzxvdfj5wdrdn79d";
        libraryHaskellDepends = [
-         base bytestring composition-prelude directory filepath
+         base bytestring composition-prelude dir-traverse
        ];
        description = "Backpack signature for archive libraries";
        license = stdenv.lib.licenses.bsd3;
@@ -30574,6 +30587,37 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "arithmoi_0_9_0_0" = callPackage
+    ({ mkDerivation, array, base, containers, deepseq, exact-pi, gauge
+     , ghc-prim, integer-gmp, integer-logarithms, QuickCheck, random
+     , semirings, smallcheck, tasty, tasty-hunit, tasty-quickcheck
+     , tasty-smallcheck, transformers, vector
+     }:
+     mkDerivation {
+       pname = "arithmoi";
+       version = "0.9.0.0";
+       sha256 = "0c1s93kf44ghhnvzhmnld4visx59pwvadfiww9smqisgjl6mpsa3";
+       configureFlags = [ "-f-llvm" ];
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base containers deepseq exact-pi ghc-prim integer-gmp
+         integer-logarithms random semirings transformers vector
+       ];
+       testHaskellDepends = [
+         base containers exact-pi integer-gmp QuickCheck semirings
+         smallcheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck
+         transformers vector
+       ];
+       benchmarkHaskellDepends = [
+         array base containers deepseq gauge integer-logarithms random
+         vector
+       ];
+       description = "Efficient basic number-theoretic functions";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "arity-generic-liftA" = callPackage
     ({ mkDerivation, base, doctest }:
      mkDerivation {
@@ -32279,8 +32323,10 @@ self: {
      }:
      mkDerivation {
        pname = "ats-pkg";
-       version = "3.2.5.12";
-       sha256 = "174nxhkfb1qvlfxjifrb1pqfrh4na64wvfrnblzpfp03di0hbh3m";
+       version = "3.2.5.13";
+       sha256 = "040ac4pw1f4nfrydqx56jv0mzap306sbr76kd164vi2n8y4a09cz";
+       revision = "1";
+       editedCabalFile = "1by5wg58g69r8xcp3nds4s5w2n3zjb1gshgsxi4fg52gfjq0wlfh";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -32510,8 +32556,8 @@ self: {
      }:
      mkDerivation {
        pname = "attoparsec-data";
-       version = "1.0.4";
-       sha256 = "03pgzx7l9hh8233r8afhgbk0adw58pln3si83vmrv1h6d8s2x4nr";
+       version = "1.0.4.1";
+       sha256 = "01avy1bbiam401mm6196h0a1m5wrki4a3xrdss6hr6x986l6w2yc";
        libraryHaskellDepends = [
          attoparsec attoparsec-time base base-prelude bytestring scientific
          text time uuid
@@ -36751,16 +36797,16 @@ self: {
 
   "bifunctors" = callPackage
     ({ mkDerivation, base, base-orphans, comonad, containers, hspec
-     , hspec-discover, QuickCheck, semigroups, tagged, template-haskell
+     , hspec-discover, QuickCheck, tagged, template-haskell
      , th-abstraction, transformers, transformers-compat
      }:
      mkDerivation {
        pname = "bifunctors";
-       version = "5.5.3";
-       sha256 = "1jn9rxg643xnlhrknmjz88nblcpsr45xwjkwwnn5nxpasa7m4d6l";
+       version = "5.5.4";
+       sha256 = "134vn71wd194175k2fcdvd0ak2bdmdbk6ql5lls4byff7zs2rmi9";
        libraryHaskellDepends = [
-         base base-orphans comonad containers semigroups tagged
-         template-haskell th-abstraction transformers
+         base base-orphans comonad containers tagged template-haskell
+         th-abstraction transformers
        ];
        testHaskellDepends = [
          base hspec QuickCheck template-haskell transformers
@@ -38556,8 +38602,8 @@ self: {
      }:
      mkDerivation {
        pname = "bioinformatics-toolkit";
-       version = "0.6.0";
-       sha256 = "1w6c8gi8vss8wz94hwv5vap2ss6qzm7la9p9dxplcw7yz3q5c47w";
+       version = "0.7.0";
+       sha256 = "1wdxlpi24c5axy8d0b9hq8wqr58ikbqy9cwrixi9dc1yya6c2mxg";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson aeson-pretty attoparsec base bytestring bytestring-lexing
@@ -41168,10 +41214,8 @@ self: {
      }:
      mkDerivation {
        pname = "boring";
-       version = "0.1";
-       sha256 = "0r263cc8bdwsaw33x96fgd8npsma9a2ffv6mfz9z72d7qclhimkk";
-       revision = "2";
-       editedCabalFile = "1jxaby4cagbhii194x9x0j75ms1v5bm14sx7d19zz3844mh9qyci";
+       version = "0.1.1";
+       sha256 = "1v33mj4rqg0l7161ajmd35k73n66cscg7wsnmb84z0wp1wxlmhwg";
        libraryHaskellDepends = [
          adjunctions base base-compat constraints fin generics-sop streams
          tagged transformers transformers-compat vec
@@ -41282,10 +41326,8 @@ self: {
      }:
      mkDerivation {
        pname = "bound-extras";
-       version = "0";
-       sha256 = "0j010sbdm0bc9dq4lsyw1vb2x0j6gcjxp7ywjn8izdh6yqr2r3qq";
-       revision = "1";
-       editedCabalFile = "0qcxcpn8hdmkg3mqz80i0j9jrym2pk11k5hyjhqbmrqlhf3fr7qw";
+       version = "0.0.1";
+       sha256 = "0f49yqz5s5h4f3m3i7kpm2fqnd42nl4dbl24lvm6z3nb8qrx6ynq";
        libraryHaskellDepends = [
          base bound deepseq hashable transformers
        ];
@@ -42037,6 +42079,8 @@ self: {
        ];
        description = "Brotli (RFC7932) compression and decompression";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {libbrotlidec = null; libbrotlienc = null;};
 
   "brotli-conduit" = callPackage
@@ -42057,6 +42101,8 @@ self: {
        ];
        description = "Conduit interface for Brotli (RFC7932) compression";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "brotli-streams" = callPackage
@@ -42075,6 +42121,8 @@ self: {
        ];
        description = "IO-Streams interface for Brotli (RFC7932) compression";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "browscap" = callPackage
@@ -43465,6 +43513,17 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "bytestring-substring" = callPackage
+    ({ mkDerivation, base, bytestring, pipes, primitive }:
+     mkDerivation {
+       pname = "bytestring-substring";
+       version = "0.1";
+       sha256 = "1vn1r8m0ldydnrazyckkn4lpv3g5ns37j91a5649jnrprjpy08dn";
+       libraryHaskellDepends = [ base bytestring pipes primitive ];
+       description = "break bytestrings up into substrings";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "bytestring-time" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, Cabal, hspec
      , QuickCheck, text, time
@@ -43956,6 +44015,41 @@ self: {
        broken = true;
      }) {};
 
+  "cabal-cache" = callPackage
+    ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3
+     , antiope-core, antiope-s3, base, bytestring, conduit-extra
+     , containers, cryptonite, deepseq, directory, exceptions, filepath
+     , generic-lens, hedgehog, hspec, hspec-discover, http-types
+     , hw-hedgehog, hw-hspec-hedgehog, lens, mtl, optparse-applicative
+     , process, raw-strings-qq, resourcet, selective, stringsearch, tar
+     , temporary, text, time, unliftio, zlib
+     }:
+     mkDerivation {
+       pname = "cabal-cache";
+       version = "1.0.0.1";
+       sha256 = "030hnkbs3cpcab7yczh12f6zmngwnbl4jgy73hkaipwkzc1qw0sc";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson amazonka amazonka-core amazonka-s3 antiope-core antiope-s3
+         base bytestring conduit-extra containers cryptonite deepseq
+         directory exceptions filepath generic-lens http-types lens mtl
+         optparse-applicative process resourcet selective stringsearch tar
+         temporary text time unliftio zlib
+       ];
+       executableHaskellDepends = [ base optparse-applicative ];
+       testHaskellDepends = [
+         aeson antiope-core antiope-s3 base bytestring filepath generic-lens
+         hedgehog hspec hw-hedgehog hw-hspec-hedgehog lens raw-strings-qq
+         text
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "CI Assistant for Haskell projects";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "cabal-cargs" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cabal-lenses, cmdargs
      , directory, filepath, lens, system-fileio, system-filepath, tasty
@@ -50919,6 +51013,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "clock_0_8" = callPackage
+    ({ mkDerivation, base, criterion, tasty, tasty-quickcheck }:
+     mkDerivation {
+       pname = "clock";
+       version = "0.8";
+       sha256 = "0539w9bjw6xbfv9v6aq9hijszxqdnqhilwpbwpql1400ji95r8q8";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base tasty tasty-quickcheck ];
+       benchmarkHaskellDepends = [ base criterion ];
+       description = "High-resolution clock functions: monotonic, realtime, cputime";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "clock-extras" = callPackage
     ({ mkDerivation, base, clock, hspec }:
      mkDerivation {
@@ -56678,6 +56786,8 @@ self: {
        pname = "control-monad-omega";
        version = "0.3.1";
        sha256 = "11hirysr76i01qj8rm22xjcrv2qwxgwjlrqqyd1dsnnvypn9hfrq";
+       revision = "1";
+       editedCabalFile = "029v5j0mnlzzn6my7jgw26gdm5fbs2h7y395zk1q7r5bfar00q58";
        libraryHaskellDepends = [ base ];
        description = "A breadth-first list monad";
        license = stdenv.lib.licenses.publicDomain;
@@ -57620,8 +57730,10 @@ self: {
      }:
      mkDerivation {
        pname = "cpkg";
-       version = "0.1.2.1";
-       sha256 = "1wn084r71fq3kx5qjvsg7l7v4njsfxbp1s4rv7f3dgyh7h36xgjj";
+       version = "0.1.3.1";
+       sha256 = "1myivznx5p2c8zw5frvp9drj7gidanq39r7lh11xyxg4rsw1y89n";
+       revision = "1";
+       editedCabalFile = "1ww05lik01k44xfrmjjs542qd66afisx6gglwqsylil86hjbs6gp";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -60174,6 +60286,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cuda_0_10_1_0" = callPackage
+    ({ mkDerivation, base, bytestring, c2hs, Cabal, directory, filepath
+     , pretty, template-haskell, uuid-types
+     }:
+     mkDerivation {
+       pname = "cuda";
+       version = "0.10.1.0";
+       sha256 = "10lyyc652ic3m4r5agszpv2r99y9fnsdwahb5pd4qiga770v45vp";
+       revision = "1";
+       editedCabalFile = "0y08nr4p6rad1393l0373s4ivq2zvgm8xv0axh5bi6n95j2khkqz";
+       isLibrary = true;
+       isExecutable = true;
+       setupHaskellDepends = [ base Cabal directory filepath ];
+       libraryHaskellDepends = [
+         base bytestring filepath template-haskell uuid-types
+       ];
+       libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [ base pretty ];
+       description = "FFI binding to the CUDA interface for programming NVIDIA GPUs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cudd" = callPackage
     ({ mkDerivation, array, base, c2hs, cudd, mtl, transformers }:
      mkDerivation {
@@ -63669,8 +63804,8 @@ self: {
      }:
      mkDerivation {
        pname = "dbus";
-       version = "1.2.5";
-       sha256 = "0s4j3j02iggvhzys9rnhr7m49dq8f5asv398jvsaibarjpdicnib";
+       version = "1.2.6";
+       sha256 = "0qqa6ch7113fygrx0fl3xr1lr8hik6c4y2r05q36pzaknhxsywgl";
        libraryHaskellDepends = [
          base bytestring cereal conduit containers deepseq exceptions
          filepath lens network parsec random split template-haskell text
@@ -65427,14 +65562,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "deque_0_4_2" = callPackage
+  "deque_0_4_2_1" = callPackage
     ({ mkDerivation, base, mtl, QuickCheck, quickcheck-instances
      , rerebase, strict-list, tasty, tasty-hunit, tasty-quickcheck
      }:
      mkDerivation {
        pname = "deque";
-       version = "0.4.2";
-       sha256 = "0zqz8akmkrkwcfkqmspr5dbk5dzhlsh7raxfvda40xhiwyni1cpf";
+       version = "0.4.2.1";
+       sha256 = "0w7d2z43flj739l3qd5vkn4bcz1ci3f24g92ky33z2gvkfiwvw9x";
        libraryHaskellDepends = [ base mtl strict-list ];
        testHaskellDepends = [
          QuickCheck quickcheck-instances rerebase tasty tasty-hunit
@@ -65665,8 +65800,8 @@ self: {
      }:
      mkDerivation {
        pname = "deriving-compat";
-       version = "0.5.4";
-       sha256 = "0kd76zvaj84391k9847q3zdvw5hlkdw3qwncysfbsvsh4g9glqwr";
+       version = "0.5.5";
+       sha256 = "1y1xy5w6ar4p6kc7g67fh93ccwnjnj81l6py1lkxlp8x4x5hpbca";
        libraryHaskellDepends = [
          base containers ghc-boot-th ghc-prim template-haskell
          th-abstraction transformers transformers-compat
@@ -65949,8 +66084,8 @@ self: {
      }:
      mkDerivation {
        pname = "df1";
-       version = "0.3";
-       sha256 = "1qiy2xxri3vdqhy78ccan7phrlfdkb2ndvrj8grlhbzycmai64i3";
+       version = "0.3.1";
+       sha256 = "0a1fpi9r6nivjxlknfyfkwdgnq5m6qmf68z46m3xjvy0md40caij";
        libraryHaskellDepends = [
          attoparsec base bytestring containers text time
        ];
@@ -66101,24 +66236,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "dhall_1_21_0" = callPackage
+  "dhall_1_22_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base
      , bytestring, case-insensitive, cborg, cborg-json, containers
      , contravariant, criterion, cryptonite, deepseq, Diff, directory
-     , doctest, dotgen, exceptions, filepath, haskeline, http-client
-     , http-client-tls, http-types, lens-family-core, megaparsec, memory
-     , mockery, mtl, optparse-applicative, parsers, prettyprinter
-     , prettyprinter-ansi-terminal, QuickCheck, quickcheck-instances
-     , repline, scientific, serialise, tasty, tasty-hunit
-     , tasty-quickcheck, template-haskell, text, transformers
-     , unordered-containers, uri-encode, vector
+     , doctest, dotgen, exceptions, filepath, foldl, haskeline
+     , http-client, http-client-tls, http-types, lens-family-core
+     , megaparsec, memory, mockery, mtl, optparse-applicative, parsers
+     , prettyprinter, prettyprinter-ansi-terminal, QuickCheck
+     , quickcheck-instances, repline, scientific, serialise, tasty
+     , tasty-hunit, tasty-quickcheck, template-haskell, text
+     , transformers, turtle, unordered-containers, uri-encode, vector
      }:
      mkDerivation {
        pname = "dhall";
-       version = "1.21.0";
-       sha256 = "03nzp79mmivnyg6s179abf8bj8j60hkng9kgbmfjzvwlfrpwq8lv";
-       revision = "1";
-       editedCabalFile = "0ap1490jks9hmwf73vlrj7bsfrf4m5yvgqxx3ix57w23ia5gy662";
+       version = "1.22.0";
+       sha256 = "0f80vxry3vns6kyviradvpn32nkcl51lva5j2naakdg9kgcq4xxz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -66134,8 +66267,9 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
          base bytestring cborg containers deepseq directory doctest filepath
-         mockery prettyprinter QuickCheck quickcheck-instances serialise
-         tasty tasty-hunit tasty-quickcheck text transformers vector
+         foldl mockery prettyprinter QuickCheck quickcheck-instances
+         serialise tasty tasty-hunit tasty-quickcheck text transformers
+         turtle vector
        ];
        benchmarkHaskellDepends = [
          base bytestring containers criterion directory serialise text
@@ -66166,14 +66300,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "dhall-bash_1_0_19" = callPackage
+  "dhall-bash_1_0_20" = callPackage
     ({ mkDerivation, base, bytestring, containers, dhall
      , neat-interpolation, optparse-generic, shell-escape, text
      }:
      mkDerivation {
        pname = "dhall-bash";
-       version = "1.0.19";
-       sha256 = "11933vw6khyhggdp6a3ib4c3qln6cmrm9ng9cc7mjmm3vpc11l7x";
+       version = "1.0.20";
+       sha256 = "1nqiyvyj0dw1a6shy9bb1qxzjrnh8544hsa2c6rwg2j36f0lk73d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -66234,23 +66368,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "dhall-json_1_2_7" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, dhall
-     , optparse-applicative, tasty, tasty-hunit, text
-     , unordered-containers, vector, yaml
+  "dhall-json_1_2_8" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
+     , dhall, exceptions, optparse-applicative, scientific, tasty
+     , tasty-hunit, text, unordered-containers, vector, yaml
      }:
      mkDerivation {
        pname = "dhall-json";
-       version = "1.2.7";
-       sha256 = "1wg3cdp1m11lqkz9qs1f5payjbxq8lph31nangrzkgxcrs7s3z0i";
+       version = "1.2.8";
+       sha256 = "0s5iygh9rfmhx3v62dnfr55xz60rjvnicrq9ydspy129mhf0zzgd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base dhall optparse-applicative text unordered-containers
        ];
        executableHaskellDepends = [
-         aeson aeson-pretty base bytestring dhall optparse-applicative text
-         vector yaml
+         aeson aeson-pretty base bytestring containers dhall exceptions
+         optparse-applicative scientific text unordered-containers vector
+         yaml
        ];
        testHaskellDepends = [
          aeson base bytestring dhall tasty tasty-hunit text
@@ -66318,6 +66453,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dhall-text_1_0_17" = callPackage
+    ({ mkDerivation, base, dhall, optparse-applicative, text }:
+     mkDerivation {
+       pname = "dhall-text";
+       version = "1.0.17";
+       sha256 = "0bs246857r801qnqvh8cb5wm1rplr7grynl4h989i61qz7vcqf53";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base dhall optparse-applicative text
+       ];
+       description = "Template text using Dhall";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dhall-to-cabal" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, contravariant
      , dhall, Diff, directory, filepath, hashable, microlens
@@ -66429,8 +66580,8 @@ self: {
     ({ mkDerivation, base, bytestring, di-core, exceptions, unix }:
      mkDerivation {
        pname = "di-handle";
-       version = "1.0";
-       sha256 = "1v4jn1dvvfa6nbqx34hhjg47lbjafkmdps8aalq3n5sah99iy26d";
+       version = "1.0.1";
+       sha256 = "070gxs75f3wvvalw81y3af5dm76hnv89rwlh6j5dks9m8mm9pgqq";
        libraryHaskellDepends = [
          base bytestring di-core exceptions unix
        ];
@@ -66571,6 +66722,8 @@ self: {
        ];
        description = "hint-based build service for the diagrams graphics EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diagrams-cairo" = callPackage
@@ -66724,6 +66877,8 @@ self: {
        ];
        description = "Preprocessor for embedding diagrams in Haddock documentation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diagrams-hsqml" = callPackage
@@ -67890,6 +68045,24 @@ self: {
        broken = true;
      }) {};
 
+  "dir-traverse" = callPackage
+    ({ mkDerivation, base, composition-prelude, criterion, directory
+     , dirstream, dlist, filepath, pipes, pipes-safe, system-filepath
+     }:
+     mkDerivation {
+       pname = "dir-traverse";
+       version = "0.1.0.0";
+       sha256 = "1sxw6hr8ajs7gxqp7kwj5v635wb7m0gxix37navp3gddr34jhan2";
+       libraryHaskellDepends = [
+         base composition-prelude directory dlist filepath
+       ];
+       benchmarkHaskellDepends = [
+         base criterion dirstream pipes pipes-safe system-filepath
+       ];
+       description = "Simple directory traversal library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "direct-binary-files" = callPackage
     ({ mkDerivation, base, bytestring, mtl }:
      mkDerivation {
@@ -68205,8 +68378,8 @@ self: {
      }:
      mkDerivation {
        pname = "discord-haskell";
-       version = "0.8.2";
-       sha256 = "0ig8qwz0qgr41x5rk59npgkyd9d2g15xvmhnq4igxzaql0b2f0pl";
+       version = "0.8.3";
+       sha256 = "15nm4dp20ch27wf86s0z3qd98419hhc988dmbv4z9qhq0f8sdcmb";
        libraryHaskellDepends = [
          aeson async base base64-bytestring bytestring containers
          data-default http-client iso8601-time JuicyPixels MonadRandom req
@@ -73526,8 +73699,8 @@ self: {
      }:
      mkDerivation {
        pname = "eliminators";
-       version = "0.5";
-       sha256 = "0d1d2pp8r2gai25q898v30gb5r82pjzi9smqndn27p1bk9xlqzzr";
+       version = "0.5.1";
+       sha256 = "0kqgfsa736sahcsgsjgyh7h1lwxzyn4z85klybmj7gffg9lz4rl1";
        libraryHaskellDepends = [
          base extra singleton-nats singletons template-haskell
          th-abstraction th-desugar
@@ -78020,22 +78193,6 @@ self: {
 
   "extra" = callPackage
     ({ mkDerivation, base, clock, directory, filepath, process
-     , QuickCheck, time, unix
-     }:
-     mkDerivation {
-       pname = "extra";
-       version = "1.6.14";
-       sha256 = "170jmwx2wnpa6bs92pcijm4ib4hq0vs4582s6v63wrcn1m9l21m6";
-       libraryHaskellDepends = [
-         base clock directory filepath process time unix
-       ];
-       testHaskellDepends = [ base directory filepath QuickCheck unix ];
-       description = "Extra functions I use";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "extra_1_6_15" = callPackage
-    ({ mkDerivation, base, clock, directory, filepath, process
      , QuickCheck, semigroups, time, unix
      }:
      mkDerivation {
@@ -78048,7 +78205,6 @@ self: {
        testHaskellDepends = [ base directory filepath QuickCheck unix ];
        description = "Extra functions I use";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "extract-dependencies" = callPackage
@@ -78508,8 +78664,8 @@ self: {
      }:
      mkDerivation {
        pname = "faktory";
-       version = "1.0.0.0";
-       sha256 = "10dvgxipik8pw2cibmw65887ri1zssy2ha72r6x57flgkr0jal0j";
+       version = "1.0.1.0";
+       sha256 = "0vkg1siaiq6dj1i0dnfdcdswr7fw4shn92wyfj8lxrj6krmfjrni";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -79008,8 +79164,8 @@ self: {
      }:
      mkDerivation {
        pname = "fay";
-       version = "0.24.0.2";
-       sha256 = "00qm6n8ali6inqmm64mrcz414iwiin8zwpavq5w1hnrmvzlbazg5";
+       version = "0.24.0.3";
+       sha256 = "07ys208iiy28hmhc098yx2vj3rzwwxqi0q7l4xx4q61albmryf08";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -79550,15 +79706,15 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
-  "fedora-haskell-tools_0_7" = callPackage
+  "fedora-haskell-tools_0_8" = callPackage
     ({ mkDerivation, base, csv, directory, fedora-dists, filepath, HTTP
      , optparse-applicative, process, simple-cmd, simple-cmd-args, split
      , time, unix
      }:
      mkDerivation {
        pname = "fedora-haskell-tools";
-       version = "0.7";
-       sha256 = "1c6pn63jn2afbnr0ink4sblhh4ggvgan9h4fk8l6bpg7g6wm68kp";
+       version = "0.8";
+       sha256 = "03wk335dpkbcdgxqsjiavnqc43jkw8gh7y41dyfwivwd9mr32y2w";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -80830,10 +80986,8 @@ self: {
      }:
      mkDerivation {
        pname = "fin";
-       version = "0.0.1";
-       sha256 = "0mqs6qayj2n54siz3bpab9z6sk9030wdaxgvgg9g36983yaqmlil";
-       revision = "1";
-       editedCabalFile = "056d22f1j1xv5ka2qr7a3z5ad5w1im76qdf77v6dqdi4vaz52vd1";
+       version = "0.0.2";
+       sha256 = "1fdykzyqc43648ka7z3jg3dciyb71ipp67ya521mp6zk9is2fx5i";
        libraryHaskellDepends = [ base deepseq hashable ];
        testHaskellDepends = [ base inspection-testing tagged ];
        description = "Nat and Fin: peano naturals and finite numbers";
@@ -84753,19 +84907,16 @@ self: {
      }) {};
 
   "freq" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, gauge
-     , hedgehog, primitive
+    ({ mkDerivation, base, binary, bytestring, containers, deepseq
+     , gauge, hedgehog, primitive
      }:
      mkDerivation {
        pname = "freq";
-       version = "0.1.0.4";
-       sha256 = "1h5lhsnm89g4g46sqiym2zf855skinirygqllf9grj6vk4qbls9n";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.1.1";
+       sha256 = "1n86njmj2y8qgfg3z1rw8p74glqkm36lm2zigv299fzlhqxsx907";
        libraryHaskellDepends = [
-         base bytestring containers deepseq primitive
+         base binary bytestring containers deepseq primitive
        ];
-       executableHaskellDepends = [ base bytestring containers ];
        testHaskellDepends = [ base bytestring containers hedgehog ];
        benchmarkHaskellDepends = [ base bytestring containers gauge ];
        description = "Are you ready to get freaky?";
@@ -87341,20 +87492,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "generic-data_0_6_0_0" = callPackage
-    ({ mkDerivation, base, base-orphans, contravariant, generic-lens
-     , one-liner, show-combinators, tasty, tasty-hunit
+  "generic-data_0_6_0_1" = callPackage
+    ({ mkDerivation, base, base-orphans, contravariant, criterion
+     , deepseq, generic-lens, one-liner, show-combinators, tasty
+     , tasty-hunit
      }:
      mkDerivation {
        pname = "generic-data";
-       version = "0.6.0.0";
-       sha256 = "0aiz7m78ysmx31754g28x0zls1kds12p2h3n35k7mxf7g1lla6fx";
+       version = "0.6.0.1";
+       sha256 = "0qahlf5vsnpy306xr9mpjif5hq21xzyw067051sfxv5k27gx4f1k";
        libraryHaskellDepends = [
          base base-orphans contravariant show-combinators
        ];
        testHaskellDepends = [
          base generic-lens one-liner tasty tasty-hunit
        ];
+       benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Deriving instances with GHC.Generics and related utilities";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -87407,8 +87560,8 @@ self: {
      }:
      mkDerivation {
        pname = "generic-deriving";
-       version = "1.12.3";
-       sha256 = "14k6yilr8x3ymwmgv51rjkqnzgm64b538gi80lj3z8p6wfjdgvfv";
+       version = "1.12.4";
+       sha256 = "0vdg9qdq35jl3m11a87wk8cq1y71qm4i1g1b2pxki0wk70yw20a4";
        libraryHaskellDepends = [
          base containers ghc-prim template-haskell th-abstraction
        ];
@@ -87659,6 +87812,8 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "A library for generic programming that aims to be easy to understand";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "generics-mrsop" = callPackage
@@ -89552,8 +89707,8 @@ self: {
     ({ mkDerivation, base, cpphs, ghc, happy }:
      mkDerivation {
        pname = "ghc-parser";
-       version = "0.2.0.2";
-       sha256 = "1130fpddf3jx84k558gsc83j3166qy15jp878w2d3lwgzxjcqx5v";
+       version = "0.2.0.3";
+       sha256 = "0j0injpah571chhgm2gzrim7908l859mgppvxp966bwla3i7j1aj";
        libraryHaskellDepends = [ base ghc ];
        libraryToolDepends = [ cpphs happy ];
        description = "Haskell source parser from GHC";
@@ -93218,6 +93373,8 @@ self: {
        pname = "gloss-accelerate";
        version = "2.0.0.1";
        sha256 = "106z8kax0m3hzk0381l8m7gxdapl3wf0fdr1ljwb5fgcjc00pac2";
+       revision = "1";
+       editedCabalFile = "0349yyzxn7r82mz4vr71dibzp0sh45b4a06hm0c0z9d7vlxj0sjj";
        libraryHaskellDepends = [ accelerate base gloss gloss-rendering ];
        description = "Extras to interface Gloss and Accelerate";
        license = stdenv.lib.licenses.bsd3;
@@ -93363,8 +93520,8 @@ self: {
        pname = "gloss-raster-accelerate";
        version = "2.0.0.0";
        sha256 = "1i0qx9wybr66i1x4n3p8ai2z6qx0k5lac422mhh4rvimcjx2bc9d";
-       revision = "2";
-       editedCabalFile = "0k0a562qa8khj39zpgp4sr8kh8h2q4krjjhbvpbsll4r83067ahj";
+       revision = "3";
+       editedCabalFile = "0nk901zy01x7v7faa20j0yawqfw3nfl27xr19ip7bn3agmq4sqq2";
        libraryHaskellDepends = [
          accelerate base colour-accelerate gloss gloss-accelerate
        ];
@@ -96913,8 +97070,8 @@ self: {
      }:
      mkDerivation {
        pname = "grammatical-parsers";
-       version = "0.3.2";
-       sha256 = "1xmxjds8jpg8q3vmmrypcz3gcjwv9sxyxmpkcrlrjm0wziv175x7";
+       version = "0.4";
+       sha256 = "0cn912rq65k234y12wwbh07wfps107i43s374lddajb853jq3wr6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -98453,6 +98610,36 @@ self: {
        broken = true;
      }) {};
 
+  "grpc-haskell" = callPackage
+    ({ mkDerivation, async, base, bytestring, clock, containers
+     , criterion, grpc-haskell-core, managed, pipes, proto3-suite
+     , proto3-wire, QuickCheck, random, safe, tasty, tasty-hunit
+     , tasty-quickcheck, text, time, transformers, turtle, unix
+     }:
+     mkDerivation {
+       pname = "grpc-haskell";
+       version = "0.0.0.0";
+       sha256 = "1d1njhrg6sfwy9f6xaxj0p8bbp2g6qjsa4cq7zq43h3vc1lkb0ii";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base bytestring grpc-haskell-core managed proto3-suite
+         proto3-wire
+       ];
+       testHaskellDepends = [
+         async base bytestring clock containers managed pipes proto3-suite
+         QuickCheck safe tasty tasty-hunit tasty-quickcheck text time
+         transformers turtle unix
+       ];
+       benchmarkHaskellDepends = [
+         async base bytestring criterion proto3-suite random
+       ];
+       description = "Haskell implementation of gRPC layered on shared C library";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {grpc-haskell-core = null;};
+
   "gruff" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , FTGL, gtk, gtkglext, mtl, old-locale, OpenGL, OpenGLRaw, parallel
@@ -99932,8 +100119,8 @@ self: {
      }:
      mkDerivation {
        pname = "hablo";
-       version = "1.0.0.0";
-       sha256 = "19lhchfvkyqjfbr7i07y6a26dyk19w83s0qa6drgnr6zqsvdqkg8";
+       version = "1.0.1.0";
+       sha256 = "1jbbh8d2xdcdgm4kq4yn6i6h9g996m2zqklg8s5b5h5jlzk7hfvs";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -103762,28 +103949,6 @@ self: {
      }:
      mkDerivation {
        pname = "hasbolt";
-       version = "0.1.3.2";
-       sha256 = "14sq3iqbrfkwyswdka2285cdhwx3c6srfhn5qb7yw1nfjx2bdb1i";
-       revision = "4";
-       editedCabalFile = "0h38mjkr3cqhsr9hwf2wj27mknnxyb2y3swzp18s7q4vmrb1ijyz";
-       libraryHaskellDepends = [
-         base binary bytestring connection containers data-binary-ieee754
-         data-default network text transformers
-       ];
-       testHaskellDepends = [
-         base bytestring containers hex hspec QuickCheck text
-       ];
-       description = "Haskell driver for Neo4j 3+ (BOLT protocol)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hasbolt_0_1_3_3" = callPackage
-    ({ mkDerivation, base, binary, bytestring, connection, containers
-     , data-binary-ieee754, data-default, hex, hspec, network
-     , QuickCheck, text, transformers
-     }:
-     mkDerivation {
-       pname = "hasbolt";
        version = "0.1.3.3";
        sha256 = "1l1p9iz9k8i1car5cd6cfd2bpidkrfbr2354hxvg8gpnw1i5jsbb";
        libraryHaskellDepends = [
@@ -103795,7 +103960,6 @@ self: {
        ];
        description = "Haskell driver for Neo4j 3+ (BOLT protocol)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasbolt-extras" = callPackage
@@ -105314,23 +105478,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "haskell-lsp_0_10_0_0" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, data-default
-     , directory, filepath, hashable, haskell-lsp-types, hslogger, hspec
-     , hspec-discover, lens, mtl, network-uri, parsec, QuickCheck
-     , quickcheck-instances, sorted-list, stm, text, time, transformers
-     , unordered-containers, vector, yi-rope
+  "haskell-lsp_0_11_0_0" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, containers
+     , data-default, directory, filepath, hashable, haskell-lsp-types
+     , hslogger, hspec, hspec-discover, lens, mtl, network-uri, parsec
+     , QuickCheck, quickcheck-instances, sorted-list, stm, text, time
+     , transformers, unordered-containers, vector, yi-rope
      }:
      mkDerivation {
        pname = "haskell-lsp";
-       version = "0.10.0.0";
-       sha256 = "01vfpv4zi6h9rdn39l7rx3y0mm2gsabwsf5ny2dbrca8x7462vys";
+       version = "0.11.0.0";
+       sha256 = "09zpslvlqw68ywwlfmygyf5qsgfwxbiqijlxmjfc3j8annb8zcwz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring containers data-default directory filepath
-         hashable haskell-lsp-types hslogger lens mtl network-uri parsec
-         sorted-list stm text time unordered-containers yi-rope
+         aeson async base bytestring containers data-default directory
+         filepath hashable haskell-lsp-types hslogger lens mtl network-uri
+         parsec sorted-list stm text time unordered-containers yi-rope
        ];
        executableHaskellDepends = [
          aeson base bytestring containers data-default directory filepath
@@ -105387,15 +105551,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "haskell-lsp-types_0_10_0_0" = callPackage
+  "haskell-lsp-types_0_11_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default, filepath
      , hashable, lens, network-uri, scientific, text
      , unordered-containers
      }:
      mkDerivation {
        pname = "haskell-lsp-types";
-       version = "0.10.0.0";
-       sha256 = "03k8sip1mgcpr93075cpylp7d9h956vxx6dpcli1r46filbb88an";
+       version = "0.11.0.0";
+       sha256 = "019kaw306hjnb98d1g9dq2q9r169qrqaxrxbkbjq083plxxjg6cx";
        libraryHaskellDepends = [
          aeson base bytestring data-default filepath hashable lens
          network-uri scientific text unordered-containers
@@ -105986,11 +106150,13 @@ self: {
     ({ mkDerivation, base, haskell-src-exts }:
      mkDerivation {
        pname = "haskell-src-exts-simple";
-       version = "1.20.0.0";
-       sha256 = "0p79ppmwb14lj2a1wy42zgm3z3zk5jbyn7rfgwxsyw2g424bw1dk";
+       version = "1.21.0.0";
+       sha256 = "0h8m1w995mpdca9is7lwv9n1w7khr5cnxzam21x7w47i546wm9rm";
        libraryHaskellDepends = [ base haskell-src-exts ];
        description = "A simplified view on the haskell-src-exts AST";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-src-exts-util" = callPackage
@@ -108326,36 +108492,6 @@ self: {
      }:
      mkDerivation {
        pname = "hasql";
-       version = "1.3.0.3";
-       sha256 = "01vl4p67yhcm8cmbmajgyd7ggj3p5f6350f8sky8kv3dn31wg6ji";
-       revision = "2";
-       editedCabalFile = "14063k0dald0i2cqk70kdja1df587vn8vrzgw3rb62nxwycr0r9b";
-       libraryHaskellDepends = [
-         attoparsec base base-prelude bytestring bytestring-strict-builder
-         contravariant contravariant-extras data-default-class dlist
-         hashable hashtables loch-th mtl placeholders postgresql-binary
-         postgresql-libpq profunctors text text-builder transformers vector
-       ];
-       testHaskellDepends = [
-         bug data-default-class QuickCheck quickcheck-instances rebase
-         rerebase tasty tasty-hunit tasty-quickcheck
-       ];
-       benchmarkHaskellDepends = [ bug criterion rerebase ];
-       description = "An efficient PostgreSQL driver and a flexible mapping API";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hasql_1_3_0_5" = callPackage
-    ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring
-     , bytestring-strict-builder, contravariant, contravariant-extras
-     , criterion, data-default-class, dlist, hashable, hashtables
-     , loch-th, mtl, placeholders, postgresql-binary, postgresql-libpq
-     , profunctors, QuickCheck, quickcheck-instances, rebase, rerebase
-     , tasty, tasty-hunit, tasty-quickcheck, text, text-builder
-     , transformers, vector
-     }:
-     mkDerivation {
-       pname = "hasql";
        version = "1.3.0.5";
        sha256 = "0qs2x4gbaffrxndivb4237vxc6qrzn2rs5kbf04n4d6py9cdhbjv";
        libraryHaskellDepends = [
@@ -108371,7 +108507,6 @@ self: {
        benchmarkHaskellDepends = [ bug criterion rerebase ];
        description = "An efficient PostgreSQL driver and a flexible mapping API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasql-backend" = callPackage
@@ -108520,8 +108655,8 @@ self: {
     ({ mkDerivation, base-prelude, hasql, hspec, resource-pool, time }:
      mkDerivation {
        pname = "hasql-pool";
-       version = "0.5.0.1";
-       sha256 = "1isnn3klvqcr13wvq6fsj3b5sysjs6xlll9s3ysihd1x4v87zii8";
+       version = "0.5.0.2";
+       sha256 = "12289a6xn7gn58s8009bwcjffvr5ipycyb2ixzkxbigaxjbprar4";
        libraryHaskellDepends = [ base-prelude hasql resource-pool time ];
        testHaskellDepends = [ base-prelude hasql hspec ];
        description = "A pool of connections for Hasql";
@@ -110543,8 +110678,8 @@ self: {
        pname = "hedgehog";
        version = "0.6.1";
        sha256 = "0xz10ycdm5vk9nrcym1fi83k19frfwqz18bz8bnpzwvaj0j41yfj";
-       revision = "3";
-       editedCabalFile = "11ifv3yymhrzin3cmlrw298lyggqc1sxmbw6n5kpjrv8cnkw28x6";
+       revision = "4";
+       editedCabalFile = "0iaqqdv4qvkzw1vasnz829k9lh7mz5nkqr8i803rilwnq40xgipx";
        libraryHaskellDepends = [
          ansi-terminal async base bytestring concurrent-output containers
          directory exceptions lifted-async mmorph monad-control mtl
@@ -113498,10 +113633,8 @@ self: {
      }:
      mkDerivation {
        pname = "hindent";
-       version = "5.2.7";
-       sha256 = "06p7rn689ynlxxgpy7ix8r69zwz4iwp7rfvcjxa6kxayfiq3hc2w";
-       revision = "2";
-       editedCabalFile = "14fdsaybp9jyhgcr5q4zl3cnhbll2q732gz52qwbmvk0q5y0zad0";
+       version = "5.3.0";
+       sha256 = "0wkfik7mvqskk23kyh7ybgnlh3j9j1ym7d3ncahsbli9w654b7xg";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -113520,7 +113653,7 @@ self: {
        ];
        benchmarkHaskellDepends = [
          base bytestring criterion deepseq directory exceptions ghc-prim
-         haskell-src-exts utf8-string
+         haskell-src-exts mtl utf8-string
        ];
        description = "Extensible Haskell pretty printer";
        license = stdenv.lib.licenses.bsd3;
@@ -114393,6 +114526,27 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "hjugement-protocol" = callPackage
+    ({ mkDerivation, base, bytestring, containers, cryptonite, hashable
+     , memory, mmorph, QuickCheck, random, tasty, tasty-hunit
+     , tasty-quickcheck, text, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "hjugement-protocol";
+       version = "0.0.0.20190428";
+       sha256 = "1a4lyysd63y9r3cg4vjn1zxwf3s6vrngl3d93l7pdabhvfpmdkjb";
+       libraryHaskellDepends = [
+         base bytestring containers cryptonite memory mmorph random text
+         transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         base containers hashable QuickCheck random tasty tasty-hunit
+         tasty-quickcheck text transformers unordered-containers
+       ];
+       description = "A cryptographic protocol for the Majority Judgment";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "hkdf" = callPackage
     ({ mkDerivation, base, byteable, bytestring, cryptohash, hspec }:
      mkDerivation {
@@ -114637,6 +114791,8 @@ self: {
        ];
        description = "An hledger workflow focusing on automated statement import and classification";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hledger-iadd" = callPackage
@@ -115455,8 +115611,8 @@ self: {
      }:
      mkDerivation {
        pname = "hmatrix-vector-sized";
-       version = "0.1.1.2";
-       sha256 = "0zj31xm0d2d7bzky9qxxs5jb5snjivdjknghpwmf8s1b85zim646";
+       version = "0.1.1.3";
+       sha256 = "1p4222rq9xm8admm3811hgb32q1nin9y35bm4c121yhz6c0ic5cg";
        libraryHaskellDepends = [ base hmatrix vector vector-sized ];
        testHaskellDepends = [
          base ghc-typelits-knownnat hedgehog hmatrix vector vector-sized
@@ -118570,6 +118726,8 @@ self: {
        ];
        description = "Compression and decompression in the brotli format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {brotlidec = null; brotlienc = null; libbrotlidec = null; 
          libbrotlienc = null;};
 
@@ -121005,6 +121163,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hslua-module-system" = callPackage
+    ({ mkDerivation, base, directory, hslua, tasty, tasty-hunit
+     , temporary, text
+     }:
+     mkDerivation {
+       pname = "hslua-module-system";
+       version = "0.1.0.1";
+       sha256 = "1qkp8pdnh8s7wh2yfpbfg1vbr7qpywa1gsz06chmwkyva0clx2cq";
+       libraryHaskellDepends = [ base directory hslua temporary ];
+       testHaskellDepends = [ base hslua tasty tasty-hunit text ];
+       description = "Lua module wrapper around Haskell's System module";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hslua-module-text" = callPackage
     ({ mkDerivation, base, bytestring, hslua, tasty, tasty-hunit, text
      }:
@@ -127398,8 +127570,8 @@ self: {
      }:
      mkDerivation {
        pname = "hylolib";
-       version = "1.5.3";
-       sha256 = "1jpmgpw7cln4r1y4jc4rn17b8wm3vw4dbbzj1fcvljdi73z5yg4b";
+       version = "1.5.4";
+       sha256 = "0vznqq8z4f42plidagmg2d099gvfk3pwv4xclar8d0gp6dsbks6v";
        libraryHaskellDepends = [
          array base containers mtl pretty random uniplate
        ];
@@ -128573,14 +128745,15 @@ self: {
      , cmdargs, containers, directory, filepath, ghc, ghc-boot
      , ghc-parser, ghc-paths, haskeline, haskell-src-exts, here, hlint
      , hspec, hspec-contrib, http-client, http-client-tls, HUnit
-     , ipython-kernel, mtl, parsec, process, random, setenv, shelly
-     , split, stm, strict, system-argv0, text, transformers, unix
-     , unordered-containers, utf8-string, uuid, vector
+     , ipython-kernel, mtl, parsec, process, random, raw-strings-qq
+     , setenv, shelly, split, stm, strict, system-argv0, text, time
+     , transformers, unix, unordered-containers, utf8-string, uuid
+     , vector
      }:
      mkDerivation {
        pname = "ihaskell";
-       version = "0.9.1.0";
-       sha256 = "1r71bijgfcsgsymg9aqjkgplg8c9g65zddr7dqf7d3mv2bpb5ain";
+       version = "0.10.0.0";
+       sha256 = "0fmz0l2mpl6qwh4c00ppryxs2nfacmi1n3k21645v62vyhk0favp";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -128589,15 +128762,15 @@ self: {
          directory filepath ghc ghc-boot ghc-parser ghc-paths haskeline
          haskell-src-exts hlint http-client http-client-tls ipython-kernel
          mtl parsec process random shelly split stm strict system-argv0 text
-         transformers unix unordered-containers utf8-string uuid vector
+         time transformers unix unordered-containers utf8-string uuid vector
        ];
        executableHaskellDepends = [
          aeson base bytestring containers directory ghc ipython-kernel
-         process strict text transformers unix
+         process strict text transformers unix unordered-containers
        ];
        testHaskellDepends = [
-         base directory ghc ghc-paths here hspec hspec-contrib HUnit setenv
-         shelly text transformers
+         base directory ghc ghc-paths here hspec hspec-contrib HUnit
+         raw-strings-qq setenv shelly text transformers
        ];
        description = "A Haskell backend kernel for the IPython project";
        license = stdenv.lib.licenses.mit;
@@ -128710,6 +128883,19 @@ self: {
        broken = true;
      }) {};
 
+  "ihaskell-graphviz" = callPackage
+    ({ mkDerivation, base, bytestring, ihaskell, process }:
+     mkDerivation {
+       pname = "ihaskell-graphviz";
+       version = "0.1.0.0";
+       sha256 = "1min39vd75rn7vwpmggf8a30fhlv5zphhmckb5a4g6lqg5v1kf1y";
+       libraryHaskellDepends = [ base bytestring ihaskell process ];
+       description = "IHaskell display instance for GraphViz (external binary)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "ihaskell-hatex" = callPackage
     ({ mkDerivation, base, HaTeX, ihaskell, text }:
      mkDerivation {
@@ -128845,8 +129031,8 @@ self: {
      }:
      mkDerivation {
        pname = "ihaskell-widgets";
-       version = "0.2.3.2";
-       sha256 = "18kp3s534k241ld1s0ds5hln47pc863dfs3i6r9w67adnf6qhff8";
+       version = "0.2.3.3";
+       sha256 = "1b4v8ng9y9n9wkadjj06iab71gbqkfr7plxxn1a9fn6qgnnlmdg8";
        libraryHaskellDepends = [
          aeson base containers ihaskell ipython-kernel scientific singletons
          text unix unordered-containers vector vinyl
@@ -131475,21 +131661,18 @@ self: {
   "invariant" = callPackage
     ({ mkDerivation, array, base, bifunctors, comonad, containers
      , contravariant, ghc-prim, hspec, hspec-discover, profunctors
-     , QuickCheck, semigroups, StateVar, stm, tagged, template-haskell
+     , QuickCheck, StateVar, stm, tagged, template-haskell
      , th-abstraction, transformers, transformers-compat
      , unordered-containers
      }:
      mkDerivation {
        pname = "invariant";
-       version = "0.5.1";
-       sha256 = "0aqj7z55632qdg45074kgn9qfdxzb0a2f8lgjzr0l0i4mm2rr37b";
-       revision = "1";
-       editedCabalFile = "100gsacbpal53khj94m5qs4aq70hbsp4dz4065czfm49ysd4yqq4";
+       version = "0.5.2";
+       sha256 = "0k3rh5gzga9snj8piqpsix5h9437kmbam75sax7aa6pirhxx0dw0";
        libraryHaskellDepends = [
          array base bifunctors comonad containers contravariant ghc-prim
-         profunctors semigroups StateVar stm tagged template-haskell
-         th-abstraction transformers transformers-compat
-         unordered-containers
+         profunctors StateVar stm tagged template-haskell th-abstraction
+         transformers transformers-compat unordered-containers
        ];
        testHaskellDepends = [ base hspec QuickCheck template-haskell ];
        testToolDepends = [ hspec-discover ];
@@ -132167,6 +132350,30 @@ self: {
        broken = true;
      }) {};
 
+  "ipython-kernel_0_10_0_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cereal, cereal-text
+     , containers, cryptonite, directory, filepath, memory, mtl, process
+     , temporary, text, transformers, unordered-containers, uuid
+     , zeromq4-haskell
+     }:
+     mkDerivation {
+       pname = "ipython-kernel";
+       version = "0.10.0.0";
+       sha256 = "1dqvii2h0vc32ladxmrzli5ch5m3is41bgalas34fh0gcc00p7qa";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base bytestring cereal cereal-text containers cryptonite
+         directory filepath memory mtl process temporary text transformers
+         unordered-containers uuid zeromq4-haskell
+       ];
+       description = "A library for creating kernels for IPython frontends";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "irc" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, HUnit, QuickCheck
      , test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -137682,6 +137889,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "kind-apply_0_3_1_0" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "kind-apply";
+       version = "0.3.1.0";
+       sha256 = "1rvm0zw5gxn4jfy7ndplrzi2k77mciiisylf9adppy1an8q4zw3d";
+       libraryHaskellDepends = [ base ];
+       description = "Utilities to work with lists of types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "kind-generics" = callPackage
     ({ mkDerivation, base, kind-apply }:
      mkDerivation {
@@ -137709,6 +137928,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "kind-generics-th_0_1_1_0" = callPackage
+    ({ mkDerivation, base, kind-generics, template-haskell
+     , th-abstraction
+     }:
+     mkDerivation {
+       pname = "kind-generics-th";
+       version = "0.1.1.0";
+       sha256 = "0pwhids2d9wfmycaxn5qm04jp1qjj8ji8casgk7d7k36fs15qgkl";
+       libraryHaskellDepends = [
+         base kind-generics template-haskell th-abstraction
+       ];
+       testHaskellDepends = [ base kind-generics ];
+       description = "Template Haskell support for generating `GenericK` instances";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "kinds" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -137763,6 +137999,29 @@ self: {
        broken = true;
      }) {};
 
+  "kleene_0_1" = callPackage
+    ({ mkDerivation, attoparsec, base, base-compat, bytestring
+     , containers, lattices, MemoTrie, QuickCheck, range-set-list
+     , regex-applicative, semigroupoids, step-function, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "kleene";
+       version = "0.1";
+       sha256 = "00w1gywdhqyy2k3y238gfjs9h2w4pjanmi45bna5lj215n0jb0hg";
+       revision = "1";
+       editedCabalFile = "0cirgqhbwz849szrzmyvs47pzja9wnmz5rc2ccylgdikkv4mg3bb";
+       libraryHaskellDepends = [
+         attoparsec base base-compat bytestring containers lattices MemoTrie
+         QuickCheck range-set-list regex-applicative semigroupoids
+         step-function text transformers
+       ];
+       description = "Kleene algebra";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "kmeans" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -137889,6 +138148,8 @@ self: {
        ];
        description = "a minimal Rmarkdown sort-of-thing for haskell, by way of Pandoc";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "knob" = callPackage
@@ -138645,8 +138906,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdabot";
-       version = "5.1.0.4";
-       sha256 = "1pywangzqf85pqhh5sn10vpk0wrd7ff5p29jrsi6sxdz5lyb7svk";
+       version = "5.2";
+       sha256 = "1ay873mnp4jzjsawxm6k17h6ciyw022a3fviqm83d0l6d1yjnyzm";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -138665,22 +138926,22 @@ self: {
     ({ mkDerivation, base, binary, bytestring, containers
      , dependent-map, dependent-sum, dependent-sum-template, directory
      , edit-distance, filepath, haskeline, hslogger, HTTP, lifted-base
-     , monad-control, mtl, network, parsec, prim-uniq, random, random-fu
-     , random-source, regex-tdfa, SafeSemaphore, split, syb
-     , template-haskell, time, transformers, transformers-base, unix
-     , utf8-string, zlib
+     , monad-control, mtl, network, network-bsd, parsec, prim-uniq
+     , random, random-fu, random-source, regex-tdfa, SafeSemaphore
+     , split, syb, template-haskell, time, transformers
+     , transformers-base, unix, utf8-string, zlib
      }:
      mkDerivation {
        pname = "lambdabot-core";
-       version = "5.1.0.4";
-       sha256 = "1cnp0w47fp0s1zlyb0d90xj5ynwfmlnzm5inc5lhbichwgqcwfzk";
+       version = "5.2";
+       sha256 = "1wh87wwb8hk3hn2lmdqi1hv77qbdmwqcwjslichygmvac8fjhjss";
        libraryHaskellDepends = [
          base binary bytestring containers dependent-map dependent-sum
          dependent-sum-template directory edit-distance filepath haskeline
-         hslogger HTTP lifted-base monad-control mtl network parsec
-         prim-uniq random random-fu random-source regex-tdfa SafeSemaphore
-         split syb template-haskell time transformers transformers-base unix
-         utf8-string zlib
+         hslogger HTTP lifted-base monad-control mtl network network-bsd
+         parsec prim-uniq random random-fu random-source regex-tdfa
+         SafeSemaphore split syb template-haskell time transformers
+         transformers-base unix utf8-string zlib
        ];
        description = "Lambdabot core functionality";
        license = "GPL";
@@ -138698,8 +138959,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdabot-haskell-plugins";
-       version = "5.1.0.4";
-       sha256 = "19fl14c1j7p9qaf26g1qkmxvmw9r7hvxqmp9jxmmwbp7xlc3664v";
+       version = "5.2";
+       sha256 = "0slq4bfkjpb13k9r9dzfhzsaz39f4ji81f8zfqs37b3r6vfvabbb";
        libraryHaskellDepends = [
          array arrows base bytestring containers data-memocombinators
          directory filepath haskell-src-exts-simple hoogle HTTP IOSpec
@@ -138721,8 +138982,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdabot-irc-plugins";
-       version = "5.1.0.4";
-       sha256 = "0kscksdqjysk9amxwb1xjh475pbwq22mf9as5kqwn72c8s75ngaf";
+       version = "5.2";
+       sha256 = "0m0dmggmri8imzm15qf5xhzha5ww0qxzg9r3w826z57fwpsql5kh";
        libraryHaskellDepends = [
          base bytestring containers directory filepath lambdabot-core
          lifted-base mtl network SafeSemaphore split time
@@ -138733,7 +138994,7 @@ self: {
      }) {};
 
   "lambdabot-misc-plugins" = callPackage
-    ({ mkDerivation, base, bytestring, containers, filepath, hstatsd
+    ({ mkDerivation, base, bytestring, containers, filepath
      , lambdabot-core, lifted-base, mtl, network, network-uri, parsec
      , process, random, random-fu, random-source, regex-tdfa
      , SafeSemaphore, split, tagsoup, template-haskell, time
@@ -138741,14 +139002,13 @@ self: {
      }:
      mkDerivation {
        pname = "lambdabot-misc-plugins";
-       version = "5.1.0.4";
-       sha256 = "169grwgg5x63qhls16c7xd0p78da38r275mar27il78az7qfgn8d";
+       version = "5.2";
+       sha256 = "1bl33np4ajiasafchqp2cf0jgb4r8s5phh2nifd82wqg4g4ajw6a";
        libraryHaskellDepends = [
-         base bytestring containers filepath hstatsd lambdabot-core
-         lifted-base mtl network network-uri parsec process random random-fu
-         random-source regex-tdfa SafeSemaphore split tagsoup
-         template-haskell time transformers transformers-base unix
-         utf8-string zlib
+         base bytestring containers filepath lambdabot-core lifted-base mtl
+         network network-uri parsec process random random-fu random-source
+         regex-tdfa SafeSemaphore split tagsoup template-haskell time
+         transformers transformers-base unix utf8-string zlib
        ];
        description = "Lambdabot miscellaneous plugins";
        license = "GPL";
@@ -138761,8 +139021,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdabot-novelty-plugins";
-       version = "5.1.0.4";
-       sha256 = "1m6n0asp8pn12wif5jv0nvjipzgh7mzzxa17j4mzd7mdqi4dma7z";
+       version = "5.2";
+       sha256 = "171zx2sicl2c5i0mq2aj82dy146i474l18958qw6nwnx9qxc023a";
        libraryHaskellDepends = [
          base binary brainfuck bytestring containers dice directory
          lambdabot-core misfortune process random-fu regex-tdfa unlambda
@@ -138778,8 +139038,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdabot-reference-plugins";
-       version = "5.1.0.4";
-       sha256 = "0qavp784p5qdb2plhhgk1idrjxcazzn4a94pg8syymb24fzjvm1w";
+       version = "5.2";
+       sha256 = "0z4hx2knj7y5cslrx3rbd2gzm1qyan4gi1v45c91nlg2g54z5cf3";
        libraryHaskellDepends = [
          base bytestring containers HTTP lambdabot-core mtl network
          network-uri oeis process regex-tdfa split tagsoup utf8-string
@@ -138794,8 +139054,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdabot-social-plugins";
-       version = "5.1.0.4";
-       sha256 = "0kjjsnrrsrcdvkn75dsbw7afx8y87i36i6lk54hs6cg88zndailz";
+       version = "5.2";
+       sha256 = "04gg7cnzahqfy69sp0wr0h1kgy6l0m0dkjbynrx2rmi5w6v4zgkl";
        libraryHaskellDepends = [
          base binary bytestring containers lambdabot-core mtl split time
        ];
@@ -138807,8 +139067,8 @@ self: {
     ({ mkDerivation, base, oeis, QuickCheck, QuickCheck-safe }:
      mkDerivation {
        pname = "lambdabot-trusted";
-       version = "5.1.0.4";
-       sha256 = "1mlyhxc93d3466xhxqlyzg1c8988spzbyk4d5l0c05l1m0xlq77j";
+       version = "5.2";
+       sha256 = "0cc1x3yxmpnhgl47y8zvbhqiryp3db30b0i89h0zb112kf8mvw5k";
        libraryHaskellDepends = [ base oeis QuickCheck QuickCheck-safe ];
        description = "Lambdabot trusted code";
        license = "GPL";
@@ -140816,6 +141076,32 @@ self: {
        broken = true;
      }) {};
 
+  "lattices_2" = callPackage
+    ({ mkDerivation, base, base-compat, containers, deepseq, hashable
+     , integer-logarithms, QuickCheck, quickcheck-instances
+     , semigroupoids, tagged, tasty, tasty-quickcheck, transformers
+     , universe-base, universe-reverse-instances, unordered-containers
+     }:
+     mkDerivation {
+       pname = "lattices";
+       version = "2";
+       sha256 = "050c66rrzh5p204jyqmysyhm419f8pasi0mlbwv3n167y0fnr8xq";
+       libraryHaskellDepends = [
+         base base-compat containers deepseq hashable integer-logarithms
+         QuickCheck semigroupoids tagged transformers universe-base
+         universe-reverse-instances unordered-containers
+       ];
+       testHaskellDepends = [
+         base base-compat containers QuickCheck quickcheck-instances tasty
+         tasty-quickcheck transformers universe-base
+         universe-reverse-instances unordered-containers
+       ];
+       description = "Fine-grained library for constructing and manipulating lattices";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "launchpad-control" = callPackage
     ({ mkDerivation, array, base, containers, hmidi, mtl, transformers
      }:
@@ -141753,20 +142039,20 @@ self: {
      , tagged, template-haskell, test-framework, test-framework-hunit
      , test-framework-quickcheck2, test-framework-th, text
      , th-abstraction, transformers, transformers-compat
-     , unordered-containers, vector, void
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "lens";
-       version = "4.17";
-       sha256 = "1k087zfy10rijr3cikalj8p58d8ypfmhb4d29bsbw8qhakg68dj7";
+       version = "4.17.1";
+       sha256 = "1gpkc53l2cggnfrgg5k4ih82rycjbdvpj9pnbi5cq8ms0dbvs4a7";
        setupHaskellDepends = [ base Cabal cabal-doctest filepath ];
        libraryHaskellDepends = [
          array base base-orphans bifunctors bytestring call-stack comonad
          containers contravariant distributive exceptions filepath free
          ghc-prim hashable kan-extensions mtl parallel profunctors
-         reflection semigroupoids semigroups tagged template-haskell text
+         reflection semigroupoids tagged template-haskell text
          th-abstraction transformers transformers-compat
-         unordered-containers vector void
+         unordered-containers vector
        ];
        testHaskellDepends = [
          base bytestring containers deepseq directory doctest filepath
@@ -142609,6 +142895,8 @@ self: {
        librarySystemDepends = [ ffi ];
        description = "LibFFI interface with dynamic bidirectional type-driven binding generation";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {ffi = null;};
 
   "libgit" = callPackage
@@ -147426,8 +147714,8 @@ self: {
      }:
      mkDerivation {
        pname = "lsp-test";
-       version = "0.5.1.1";
-       sha256 = "03dvkh8i6mkmcv1pvaqlr9pava14qxbd31my4hjvs37xzm6dw22b";
+       version = "0.5.1.2";
+       sha256 = "1fc58krsm2q92azkcq57xdj7ngqvkqbvngjcr3plf0793xdarxj8";
        libraryHaskellDepends = [
          aeson aeson-pretty ansi-terminal base bytestring conduit
          conduit-parse containers data-default Diff directory filepath
@@ -147444,7 +147732,7 @@ self: {
        broken = true;
      }) {};
 
-  "lsp-test_0_5_1_3" = callPackage
+  "lsp-test_0_5_2_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base
      , bytestring, conduit, conduit-parse, containers, data-default
      , Diff, directory, filepath, haskell-lsp, hspec, lens, mtl
@@ -147453,10 +147741,8 @@ self: {
      }:
      mkDerivation {
        pname = "lsp-test";
-       version = "0.5.1.3";
-       sha256 = "1ksjsxf5y9jx7j8rbfsvc667p7ikvvvscvjaa97mps8aci5izv48";
-       revision = "1";
-       editedCabalFile = "1aa59vpfa5an1fx3xq92lzg9k7wkwbxncmx04zkwdidwh5i2p4pg";
+       version = "0.5.2.0";
+       sha256 = "1yy9d2jljxiq869qq588b7pmdrv4z0fpb8aq3i5anwzk6bgw4lx2";
        libraryHaskellDepends = [
          aeson aeson-pretty ansi-terminal base bytestring conduit
          conduit-parse containers data-default Diff directory filepath
@@ -149697,6 +149983,8 @@ self: {
        ];
        description = "foldl wrappers for map-reduce";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "map-syntax" = callPackage
@@ -150218,7 +150506,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "massiv_0_3_0_1" = callPackage
+  "massiv_0_3_1_0" = callPackage
     ({ mkDerivation, async, base, bytestring, Cabal, cabal-doctest
      , containers, data-default, data-default-class, deepseq, doctest
      , exceptions, hspec, primitive, QuickCheck, scheduler
@@ -150226,8 +150514,8 @@ self: {
      }:
      mkDerivation {
        pname = "massiv";
-       version = "0.3.0.1";
-       sha256 = "175dhcpv9gki3rb9vr1xig1sw6hams20clxql9y61xfhv0hryj0v";
+       version = "0.3.1.0";
+       sha256 = "0hjfnp8w3yk1kfx2avmfv3cbhrzyh89nw5zlm0r5fpgdx3gmkn6k";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base bytestring data-default-class deepseq exceptions primitive
@@ -153125,22 +153413,22 @@ self: {
   "mighttpd2" = callPackage
     ({ mkDerivation, array, async, auto-update, base, byteorder
      , bytestring, case-insensitive, conduit, conduit-extra, directory
-     , filepath, hspec, http-client, http-date, http-types, io-choice
-     , network, old-locale, parsec, resourcet, streaming-commons, time
+     , filepath, hspec, http-client, http-date, http-types, network
+     , old-locale, parsec, resourcet, streaming-commons, time
      , transformers, unix, unix-time, unordered-containers, wai
      , wai-app-file-cgi, wai-http2-extra, wai-logger, warp
      }:
      mkDerivation {
        pname = "mighttpd2";
-       version = "3.4.3";
-       sha256 = "0afa25kaagdznfg1kbm5hbmlfk75p7rws0x9fjb505wrr12jipbh";
+       version = "3.4.4";
+       sha256 = "0n73zr3scn6sgqwaqjzcm3gybf2j0nwdcfq4cmsq9wanc5naz1pd";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array async auto-update base byteorder bytestring case-insensitive
          conduit conduit-extra directory filepath http-date http-types
-         io-choice network parsec resourcet streaming-commons unix unix-time
+         network parsec resourcet streaming-commons unix unix-time
          unordered-containers wai wai-app-file-cgi warp
        ];
        executableHaskellDepends = [
@@ -153709,8 +153997,8 @@ self: {
      }:
      mkDerivation {
        pname = "minitypeset-opengl";
-       version = "0.1.0.0";
-       sha256 = "06fh4j0sfpd8w576s04a6bg6h4c7lsk7zm85dlcfhlghyg2gwri1";
+       version = "0.2.0.1";
+       sha256 = "0vf2npnm4zpslwqr051v4im82h5al5nl9mq5f68pk03limgrf8ik";
        libraryHaskellDepends = [
          base containers filepath OpenGL stb-truetype
        ];
@@ -154312,6 +154600,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mmark_0_0_7_0" = callPackage
+    ({ mkDerivation, aeson, base, case-insensitive, containers
+     , criterion, deepseq, dlist, email-validate, foldl, hashable, hspec
+     , hspec-megaparsec, html-entity-map, lucid, megaparsec, microlens
+     , microlens-th, modern-uri, mtl, parser-combinators, QuickCheck
+     , text, text-metrics, unordered-containers, weigh, yaml
+     }:
+     mkDerivation {
+       pname = "mmark";
+       version = "0.0.7.0";
+       sha256 = "0g7mx3xvvj8vgcids231zlz9kp7z3zjrq4xfhdm0wk0v1k51dflx";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base case-insensitive containers deepseq dlist email-validate
+         foldl hashable html-entity-map lucid megaparsec microlens
+         microlens-th modern-uri mtl parser-combinators text text-metrics
+         unordered-containers yaml
+       ];
+       testHaskellDepends = [
+         aeson base foldl hspec hspec-megaparsec lucid megaparsec modern-uri
+         QuickCheck text
+       ];
+       benchmarkHaskellDepends = [ base criterion text weigh ];
+       description = "Strict markdown processor for writers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mmark-cli" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory
      , ghc-syntax-highlighter, gitrev, lucid, megaparsec, mmark
@@ -154366,6 +154682,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mmorph_1_1_3" = callPackage
+    ({ mkDerivation, base, mtl, transformers, transformers-compat }:
+     mkDerivation {
+       pname = "mmorph";
+       version = "1.1.3";
+       sha256 = "0rfsy9n9mlinpmqi2s17fhc67fzma2ig5fbmh6m5m830canzf8vr";
+       libraryHaskellDepends = [
+         base mtl transformers transformers-compat
+       ];
+       description = "Monad morphisms";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mmtf" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , data-msgpack, deepseq, hspec, http-conduit, QuickCheck, text
@@ -156966,6 +157296,22 @@ self: {
        broken = true;
      }) {};
 
+  "morpheus-graphql" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
+     , mtl, scientific, text, transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "morpheus-graphql";
+       version = "0.0.1";
+       sha256 = "1a9wkpsj8850abpz2z5cphphllpwzdc1l38ljfghd79y278cc1zm";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring containers mtl scientific text
+         transformers unordered-containers vector
+       ];
+       description = "Morpheus GraphQL";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "morphisms" = callPackage
     ({ mkDerivation }:
      mkDerivation {
@@ -157264,12 +157610,12 @@ self: {
      , daemons, directory, exceptions, filepath, gi-glib, gi-gobject
      , gi-gst, haskell-gi-base, haskell-gi-overloading, lens, MissingH
      , mtl, network, random, resourcet, simple-ui, template-haskell
-     , text, utf8-string, vty
+     , text, unix, utf8-string, vty
      }:
      mkDerivation {
        pname = "mp";
-       version = "1.0.2";
-       sha256 = "07npcr1rjypjbxrv3hccqfac3piq00psc7yxgh7iw8pl8izqrwl7";
+       version = "1.1.0";
+       sha256 = "1msy52c1702q16pmbzc69iyj7bj9xdh4c72d15sigblh9hwvipmm";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -157277,7 +157623,7 @@ self: {
          async base binary ConfigFile containers daemons directory
          exceptions filepath gi-glib gi-gobject gi-gst haskell-gi-base
          haskell-gi-overloading lens MissingH mtl network random resourcet
-         simple-ui template-haskell text utf8-string vty
+         simple-ui template-haskell text unix utf8-string vty
        ];
        description = "Music player for linux";
        license = stdenv.lib.licenses.gpl2;
@@ -157783,6 +158129,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mtl-compat_0_2_2" = callPackage
+    ({ mkDerivation, base, mtl }:
+     mkDerivation {
+       pname = "mtl-compat";
+       version = "0.2.2";
+       sha256 = "17iszr5yb4f17g8mq6i74hsamii8z6m2qfsmgzs78mhiwa7kjm8r";
+       libraryHaskellDepends = [ base mtl ];
+       doHaddock = false;
+       description = "Backported Control.Monad.Except module from mtl";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mtl-evil-instances" = callPackage
     ({ mkDerivation, base, monad-control, mtl, transformers
      , transformers-base
@@ -158082,6 +158441,25 @@ self: {
        broken = true;
      }) {};
 
+  "multi-containers" = callPackage
+    ({ mkDerivation, base, containers, directory, extra, filepath
+     , hspec
+     }:
+     mkDerivation {
+       pname = "multi-containers";
+       version = "0.1.0.0";
+       sha256 = "1ig4i2jbkmap3iy8kdqwfr3n3jx30dy66x9lq03nlkxxpi0p1y93";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base containers ];
+       executableHaskellDepends = [
+         base containers directory extra filepath
+       ];
+       testHaskellDepends = [ base containers hspec ];
+       description = "A few variants of multimaps";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "multi-instance" = callPackage
     ({ mkDerivation, base, doctest }:
      mkDerivation {
@@ -158476,6 +158854,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "multiprocess" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "multiprocess";
+       version = "0.0.0";
+       sha256 = "06f1yq4x9jc7cv8nxsqbm47xbv6b2cp1q8xkbhlqr9dbz8cvf5my";
+       libraryHaskellDepends = [ base ];
+       description = "Multiprocess architecture library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "multirec" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -161626,17 +162015,18 @@ self: {
      }) {};
 
   "network" = callPackage
-    ({ mkDerivation, base, bytestring, directory, doctest, hspec, HUnit
-     , unix
+    ({ mkDerivation, base, bytestring, directory, doctest, hspec
+     , hspec-discover, HUnit, unix
      }:
      mkDerivation {
        pname = "network";
-       version = "2.8.0.0";
-       sha256 = "00skcish0xmm67ax999nv1nll9rm3gqmn92099iczd73nxl55468";
+       version = "2.8.0.1";
+       sha256 = "0im8k51rw3ahmr23ny10pshwbz09jfg0fdpam0hzf2hgxnzmvxb1";
        libraryHaskellDepends = [ base bytestring unix ];
        testHaskellDepends = [
          base bytestring directory doctest hspec HUnit
        ];
+       testToolDepends = [ hspec-discover ];
        description = "Low-level networking interface";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -161657,6 +162047,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "network_3_1_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, directory, hspec
+     , hspec-discover, HUnit
+     }:
+     mkDerivation {
+       pname = "network";
+       version = "3.1.0.0";
+       sha256 = "0xskqnv90h8lc663ilprwgsmx9nv7534kwsv9acxlcfvqy1nnq4s";
+       libraryHaskellDepends = [ base bytestring deepseq ];
+       testHaskellDepends = [ base bytestring directory hspec HUnit ];
+       testToolDepends = [ hspec-discover ];
+       description = "Low-level networking interface";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "network-address" = callPackage
     ({ mkDerivation, base, Cabal, QuickCheck, test-framework
      , test-framework-quickcheck2
@@ -161823,8 +162229,6 @@ self: {
        libraryHaskellDepends = [ base deepseq network ];
        description = "POSIX network database (<netdb.h>) API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-builder" = callPackage
@@ -167667,8 +168071,8 @@ self: {
      }:
      mkDerivation {
        pname = "optparse-applicative-simple";
-       version = "1.0.3";
-       sha256 = "07v47fa2yc3rxdn1lbgbsq8ggfd7zlknz2ib8wf628g95n0dl7ya";
+       version = "1.1";
+       sha256 = "0v6nwgk94ax0k281fyxfi42njfi0rw36vrhak9i8k7h5z43xkfr3";
        libraryHaskellDepends = [
          attoparsec attoparsec-data base-prelude optparse-applicative text
        ];
@@ -167725,24 +168129,6 @@ self: {
      }:
      mkDerivation {
        pname = "optparse-simple";
-       version = "0.1.1.1";
-       sha256 = "0nqr81q5rvzpgl3r79rrmf30jzkds8gwdir2w1c9775jy2wslssl";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base githash optparse-applicative template-haskell transformers
-       ];
-       testHaskellDepends = [ base bytestring directory ];
-       description = "Simple interface to optparse-applicative";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "optparse-simple_0_1_1_2" = callPackage
-    ({ mkDerivation, base, bytestring, directory, githash
-     , optparse-applicative, template-haskell, transformers
-     }:
-     mkDerivation {
-       pname = "optparse-simple";
        version = "0.1.1.2";
        sha256 = "1r00hkri42vyx552l8hcd1779fxiyl9w4k0pql915zsprirn8w82";
        isLibrary = true;
@@ -167753,7 +168139,6 @@ self: {
        testHaskellDepends = [ base bytestring directory ];
        description = "Simple interface to optparse-applicative";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "optparse-text" = callPackage
@@ -169197,10 +169582,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-crossref";
-       version = "0.3.4.0";
-       sha256 = "15vfqpfkw4wnsg98804l5ylqbc926s2j5z4ik5zhval4d3kiamgz";
-       revision = "3";
-       editedCabalFile = "11ajbgw8icgvn8ylfpgnd4sxivlxx2f58363va1gar1kipf7gkar";
+       version = "0.3.4.1";
+       sha256 = "19hs4akqsg7nlspnbdbyncq8irj0a3h8akmyfzxmi2yb35x7c8ny";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -175171,6 +175554,8 @@ self: {
        ];
        description = "Brotli (RFC7932) compressors and decompressors for the Pipes package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-bytestring" = callPackage
@@ -177463,20 +177848,22 @@ self: {
      }) {};
 
   "poly" = callPackage
-    ({ mkDerivation, base, QuickCheck, quickcheck-classes, semirings
-     , tasty, tasty-quickcheck, vector
+    ({ mkDerivation, base, primitive, QuickCheck, quickcheck-classes
+     , semirings, tasty, tasty-quickcheck, vector
      }:
      mkDerivation {
        pname = "poly";
-       version = "0.1.0.0";
-       sha256 = "1aipcajm5vg7ircpds2sg7ryvhid77hc56hsk146i5hyblnb4wbw";
-       libraryHaskellDepends = [ base semirings vector ];
+       version = "0.2.0.0";
+       sha256 = "19jdm2508ncwcci8bi9hwpaak3cymhbynnk3whmh0g6rny6zdla4";
+       libraryHaskellDepends = [ base primitive semirings vector ];
        testHaskellDepends = [
          base QuickCheck quickcheck-classes semirings tasty tasty-quickcheck
          vector
        ];
        description = "Polynomials";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "poly-arity" = callPackage
@@ -177642,8 +178029,8 @@ self: {
      }:
      mkDerivation {
        pname = "polysemy";
-       version = "0.1.1.0";
-       sha256 = "02x99b3pral2sclx4zizib9a7yrnahg0d5kc4w37yk15mpr5lmys";
+       version = "0.1.2.0";
+       sha256 = "18713nqrijbciwhazy7nvs3zizkxz2cs3c7q8xkc5j4bgk90vsxm";
        libraryHaskellDepends = [
          base mtl random syb template-haskell transformers
        ];
@@ -177659,6 +178046,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "polysemy-plugin" = callPackage
+    ({ mkDerivation, base, ghc, ghc-tcplugins-extra, hspec, polysemy }:
+     mkDerivation {
+       pname = "polysemy-plugin";
+       version = "0.1.0.0";
+       sha256 = "0zsgvb5l740a1mxjrjaxmzlcqd9qvzx973slnvb299z0l2h322fr";
+       libraryHaskellDepends = [ base ghc ghc-tcplugins-extra polysemy ];
+       testHaskellDepends = [
+         base ghc ghc-tcplugins-extra hspec polysemy
+       ];
+       description = "Disambiguate obvious uses of effects";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "polyseq" = callPackage
     ({ mkDerivation, array, base, bytestring, cgi, containers
      , free-theorems, haskell-src, mtl, network, old-locale, old-time
@@ -177743,8 +178144,10 @@ self: {
      }:
      mkDerivation {
        pname = "pomaps";
-       version = "0.0.2.0";
-       sha256 = "08mlj61archpiqq8375gi5ha9mpxgpnsfpsx3kqja92dgj0aq5q6";
+       version = "0.0.2.1";
+       sha256 = "1p0sqh87scpff1j4q4mpb3dyml0vsh2yrhdc7hv0rbm0vhy2bvla";
+       revision = "1";
+       editedCabalFile = "0v1s35ddx697rzgp08p6brn801w7gky73w1qll3d10vy4qbhs435";
        libraryHaskellDepends = [
          base containers deepseq ghc-prim lattices
        ];
@@ -178042,8 +178445,8 @@ self: {
     ({ mkDerivation, async, base, hspec, network, stm, transformers }:
      mkDerivation {
        pname = "port-utils";
-       version = "0.2.0.0";
-       sha256 = "1lvalwbizmvrrpbl2l1lblbv0c3qln1ln61x61zn26jxq2h8p7g1";
+       version = "0.2.1.0";
+       sha256 = "1phpf6n7bjg3a22syh45xsiczqlay82z3isdn6dq5alxdaa31y5n";
        libraryHaskellDepends = [ base network ];
        testHaskellDepends = [ async base hspec network stm transformers ];
        description = "Utilities for creating and waiting on ports";
@@ -178733,8 +179136,8 @@ self: {
      }:
      mkDerivation {
        pname = "postgresql-simple";
-       version = "0.6.1";
-       sha256 = "0hc3zarmykf0hvc5jr0rm66z4kar73zp737m4vg0y2nc2k5yp9m8";
+       version = "0.6.2";
+       sha256 = "15pkflx48mgv4fjmnagyfh06q065k8m8c98bysc3gm6m4srz5ypv";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring bytestring-builder
          case-insensitive containers hashable Only postgresql-libpq
@@ -180610,6 +181013,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "primitive-atomic" = callPackage
+    ({ mkDerivation, base, primitive }:
+     mkDerivation {
+       pname = "primitive-atomic";
+       version = "0.1.0.0";
+       sha256 = "0qprxv3y1ayrdz9spgg1vkx5jkh0p5pz49c3gaaxcz8v0pdk0bzv";
+       libraryHaskellDepends = [ base primitive ];
+       testHaskellDepends = [ base primitive ];
+       description = "Wrappers for primops around atomic operations";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "primitive-checked" = callPackage
     ({ mkDerivation, base, primitive }:
      mkDerivation {
@@ -182033,8 +182448,8 @@ self: {
      }:
      mkDerivation {
        pname = "propellor";
-       version = "5.7.0";
-       sha256 = "0a46lqc77l4dlimvqf57n48zf0qschk04xyjbvyhcj4yw9jn9jdn";
+       version = "5.8.0";
+       sha256 = "0dzil48ayfy30cx1mxhp712nibr7qc3hn2pkc11nawkf2g73552f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -182502,6 +182917,69 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "proto3-suite" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base
+     , base64-bytestring, binary, bytestring, cereal, containers
+     , contravariant, deepseq, doctest, filepath, foldl, hashable
+     , haskell-src, insert-ordered-containers, lens, mtl
+     , neat-interpolation, optparse-generic, parsec, parsers, pretty
+     , pretty-show, proto3-wire, QuickCheck, quickcheck-instances
+     , range-set-list, safe, semigroups, swagger2, system-filepath
+     , tasty, tasty-hunit, tasty-quickcheck, text, transformers, turtle
+     , vector
+     }:
+     mkDerivation {
+       pname = "proto3-suite";
+       version = "0.3.0.0";
+       sha256 = "1dmblb640jc2smm023py3sg49k07v85qmalir5swkj154vlszgli";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson aeson-pretty attoparsec base base64-bytestring binary
+         bytestring cereal containers contravariant deepseq filepath foldl
+         hashable haskell-src insert-ordered-containers lens mtl
+         neat-interpolation parsec parsers pretty pretty-show proto3-wire
+         QuickCheck quickcheck-instances safe semigroups swagger2
+         system-filepath text transformers turtle vector
+       ];
+       executableHaskellDepends = [
+         base containers optparse-generic proto3-wire range-set-list
+         system-filepath text turtle
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base base64-bytestring bytestring cereal
+         containers doctest pretty-show proto3-wire QuickCheck semigroups
+         swagger2 tasty tasty-hunit tasty-quickcheck text transformers
+         turtle vector
+       ];
+       description = "A low level library for writing out data in the Protocol Buffers wire format";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "proto3-wire" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, containers, deepseq
+     , doctest, hashable, QuickCheck, safe, tasty, tasty-hunit
+     , tasty-quickcheck, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "proto3-wire";
+       version = "1.0.0";
+       sha256 = "1r090s4mqmx0ixr8y6xyzkgcwv0sfjwah7jhb4vr75zpzsvx0bqk";
+       libraryHaskellDepends = [
+         base bytestring cereal containers deepseq hashable QuickCheck safe
+         text unordered-containers
+       ];
+       testHaskellDepends = [
+         base bytestring cereal doctest QuickCheck tasty tasty-hunit
+         tasty-quickcheck text
+       ];
+       description = "A low-level implementation of the Protocol Buffers (version 3) wire format";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "protobuf" = callPackage
     ({ mkDerivation, base, base-orphans, bytestring, cereal, containers
      , data-binary-ieee754, deepseq, hex, HUnit, mtl, QuickCheck, tagged
@@ -183778,6 +184256,8 @@ self: {
        testHaskellDepends = [ aeson base hspec ];
        description = "Send push notifications to mobile iOS devices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "push-notify-ccs" = callPackage
@@ -184627,6 +185107,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "quadratic-irrational_0_1_0" = callPackage
+    ({ mkDerivation, arithmoi, base, containers, directory, doctest
+     , filepath, mtl, numbers, QuickCheck, tasty, tasty-quickcheck
+     , transformers
+     }:
+     mkDerivation {
+       pname = "quadratic-irrational";
+       version = "0.1.0";
+       sha256 = "0kfgvixvcawfhw4vv0zg2r0d6hrlak01q9isqc3n3lc63qaifxgy";
+       libraryHaskellDepends = [ arithmoi base containers transformers ];
+       testHaskellDepends = [
+         arithmoi base directory doctest filepath mtl numbers QuickCheck
+         tasty tasty-quickcheck
+       ];
+       description = "An implementation of quadratic irrationals";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "quandl-api" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring
      , http-conduit, http-types, syb, text, time, time-locale-compat
@@ -185071,6 +185570,29 @@ self: {
      }:
      mkDerivation {
        pname = "quickcheck-classes";
+       version = "0.6.0.0";
+       sha256 = "02ssvvhi87ggyxi3jsg2h1xirwqyydda88n5ax4imfljvig366cy";
+       libraryHaskellDepends = [
+         aeson base base-orphans bifunctors containers fail primitive
+         QuickCheck semigroupoids semigroups semirings tagged transformers
+       ];
+       testHaskellDepends = [
+         aeson base base-orphans containers primitive QuickCheck
+         semigroupoids tagged tasty tasty-quickcheck transformers vector
+       ];
+       description = "QuickCheck common typeclasses";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "quickcheck-classes_0_6_1_0" = callPackage
+    ({ mkDerivation, aeson, base, base-orphans, bifunctors, containers
+     , fail, primitive, QuickCheck, semigroupoids, semigroups, semirings
+     , tagged, tasty, tasty-quickcheck, transformers, vector
+     }:
+     mkDerivation {
+       pname = "quickcheck-classes";
        version = "0.6.1.0";
        sha256 = "01mqsffks1d0wf3vwrlmalqxqha2gfqa389gqq0zr5b9y7ka5a8h";
        libraryHaskellDepends = [
@@ -188797,8 +189319,8 @@ self: {
      }:
      mkDerivation {
        pname = "recursion-schemes";
-       version = "5.1.2";
-       sha256 = "0mya8lijdnxw3vm0dqp878gqmd3qfymk1dnp6hqihbvsnzm5l910";
+       version = "5.1.3";
+       sha256 = "0a0mkwy3sxg5f1mdlblpn0xl3lwgilnmzs94jqab0pqx9gjkc5xj";
        libraryHaskellDepends = [
          base base-orphans comonad free template-haskell th-abstraction
          transformers
@@ -194295,8 +194817,8 @@ self: {
      }:
      mkDerivation {
        pname = "ron-rdt";
-       version = "0.5";
-       sha256 = "0djqbr5wiillk0ksbhvnswrxq3jz8cfd7m2kw0g1207kd29vvbd3";
+       version = "0.6";
+       sha256 = "0npd4fh3flywfrpnwfsfpss4zbzd9jj9xsbpxlcc4hhjh45x1b6b";
        libraryHaskellDepends = [
          base containers Diff hashable integer-gmp mtl ron text time
          transformers unordered-containers
@@ -194312,8 +194834,8 @@ self: {
      }:
      mkDerivation {
        pname = "ron-schema";
-       version = "0.5";
-       sha256 = "13i7hnl3l890r5y106b957nlvv3v2h6l2gmkq77pizlqlyv73jzi";
+       version = "0.6";
+       sha256 = "07nn74vwx26flam7klwfvj4yz5mqh8d5flf5ps7wxxfn70z3g4yg";
        libraryHaskellDepends = [
          base bytestring containers hedn integer-gmp megaparsec mtl ron
          ron-rdt template-haskell text transformers
@@ -194329,8 +194851,8 @@ self: {
      }:
      mkDerivation {
        pname = "ron-storage";
-       version = "0.6";
-       sha256 = "07bnvlamw8cdw9s8fra9fd1jz3sw203jnimj2ad50rahn2r3zrnq";
+       version = "0.7";
+       sha256 = "0wqvbnylz2wx85c7qfqzima3axif6r65vc0iwl8lrmxpif2zs41c";
        libraryHaskellDepends = [
          base bytestring containers directory filepath integer-gmp mtl
          network-info ron ron-rdt stm text transformers
@@ -195595,6 +196117,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "safe-decimal" = callPackage
+    ({ mkDerivation, base, deepseq, exceptions, hspec, hspec-discover
+     , QuickCheck, scientific
+     }:
+     mkDerivation {
+       pname = "safe-decimal";
+       version = "0.1.0.0";
+       sha256 = "10y618swfxvz38fm95i6jbki5ax6w6xxhrdizqlrbwnqdjlsj681";
+       revision = "1";
+       editedCabalFile = "0449df25rah097rsbrbkb8sb4n80yms06isg0g8mp7v8ah4ssrs3";
+       libraryHaskellDepends = [ base deepseq exceptions scientific ];
+       testHaskellDepends = [ base deepseq hspec QuickCheck scientific ];
+       testToolDepends = [ hspec-discover ];
+       description = "Safe and very efficient arithmetic operations on fixed decimal point numbers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "safe-exceptions" = callPackage
     ({ mkDerivation, base, deepseq, exceptions, hspec, transformers
      , void
@@ -197438,6 +197977,8 @@ self: {
        ];
        description = "Work stealing scheduler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "schedyield" = callPackage
@@ -197843,8 +198384,8 @@ self: {
        pname = "scotty";
        version = "0.11.3";
        sha256 = "14570k1klrlwra58zz7ip3j41nc75gaswrp8m4xwlrjzgpdqm70a";
-       revision = "1";
-       editedCabalFile = "0pcaw6wr8nqs7pl64pb00zxd359np5x35159lqkqlcziiv0n2g3b";
+       revision = "2";
+       editedCabalFile = "0d5ls120fq9xfdsdzj1xgfh2prpcz46i4kc54r6pd6ncpnkfalyi";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring case-insensitive
          data-default-class exceptions fail http-types monad-control mtl
@@ -202684,35 +203225,6 @@ self: {
      }:
      mkDerivation {
        pname = "serverless-haskell";
-       version = "0.8.6";
-       sha256 = "1ji1rkgrygsmrvgpirvc1pr2rw2xq15ff1v86ckwn7gcb9q8z7jy";
-       libraryHaskellDepends = [
-         aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis
-         amazonka-s3 base bytestring case-insensitive http-types iproute
-         lens network network-simple text time unix unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis
-         amazonka-s3 base bytestring case-insensitive hspec hspec-discover
-         http-types iproute lens network network-simple raw-strings-qq text
-         time unix unordered-containers
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Deploying Haskell code onto AWS Lambda using Serverless";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "serverless-haskell_0_8_7" = callPackage
-    ({ mkDerivation, aeson, aeson-casing, aeson-extra, amazonka-core
-     , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive
-     , hspec, hspec-discover, http-types, iproute, lens, network
-     , network-simple, raw-strings-qq, text, time, unix
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "serverless-haskell";
        version = "0.8.7";
        sha256 = "0q73j6n6552ajv5sm52rbcj4kk86wjmvrh6khci1nbln4wxgbwq2";
        libraryHaskellDepends = [
@@ -204609,18 +205121,17 @@ self: {
 
   "shift" = callPackage
     ({ mkDerivation, ansi-terminal, base, binary, bytestring
-     , composition-prelude, microlens, optparse-applicative
-     , system-fileio, system-filepath, text, turtle
+     , composition-prelude, directory, filepath, optparse-applicative
      }:
      mkDerivation {
        pname = "shift";
-       version = "0.2.1.1";
-       sha256 = "1sxzgbdha8caf4xhsma45wiqagzga1zifkp14a5s01a2013pdizm";
+       version = "0.2.1.2";
+       sha256 = "1g3qvk3b6qiawrjvzxv6nbr71zxb8c5rsi4agjhq8d1d6g9m9f42";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         ansi-terminal base binary bytestring composition-prelude microlens
-         optparse-applicative system-fileio system-filepath text turtle
+         ansi-terminal base binary bytestring composition-prelude directory
+         filepath optparse-applicative
        ];
        description = "A tool to quickly switch between directories";
        license = stdenv.lib.licenses.mit;
@@ -206071,8 +206582,8 @@ self: {
      }:
      mkDerivation {
        pname = "simple-ui";
-       version = "0.1.1";
-       sha256 = "1phag0frz7l4xgrgjc72x9iwjl1z1l6mpz7lnifjgn7zp3wdkwzs";
+       version = "0.1.2";
+       sha256 = "106fcxl97gnkpv2bc50bg5zv8j7f1cdyxbl1l99p3rsq6wr6mr0m";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base data-default-class exceptions lens mtl stm template-haskell
@@ -210060,6 +210571,19 @@ self: {
        broken = true;
      }) {softfloat = null;};
 
+  "solar" = callPackage
+    ({ mkDerivation, base, time }:
+     mkDerivation {
+       pname = "solar";
+       version = "0.1.0.0";
+       sha256 = "1dyg4g89bxnik3hqzqbwmlv6278w8d6gpmjwm06af248vn34kvhk";
+       revision = "1";
+       editedCabalFile = "0r4786crxih8z4dwi0grpga2kp8ivvnmwa0lhddmn16bfqwa16s9";
+       libraryHaskellDepends = [ base time ];
+       description = "Simple library for solar calculations";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "solga" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, hashable
      , hspec, hspec-wai, hspec-wai-json, http-types, QuickCheck
@@ -212818,6 +213342,33 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "stack2nix_0_2_3" = callPackage
+    ({ mkDerivation, async, base, bytestring, Cabal, cabal2nix
+     , containers, directory, distribution-nixpkgs, filepath, hackage-db
+     , hspec, language-nix, lens, optparse-applicative, path, pretty
+     , process, regex-pcre, SafeSemaphore, stack, temporary, text, time
+     }:
+     mkDerivation {
+       pname = "stack2nix";
+       version = "0.2.3";
+       sha256 = "0vc87jb5vam47ghh2bzs20wfsnxjs133j9qrxa6kzbw0s2ff75p3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base bytestring Cabal cabal2nix containers directory
+         distribution-nixpkgs filepath hackage-db language-nix lens
+         optparse-applicative path pretty process regex-pcre SafeSemaphore
+         stack temporary text time
+       ];
+       executableHaskellDepends = [
+         base Cabal optparse-applicative time
+       ];
+       testHaskellDepends = [ base hspec ];
+       description = "Convert stack.yaml files into Nix build instructions.";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "stackage" = callPackage
     ({ mkDerivation, base, stackage-build-plan, stackage-cabal
      , stackage-cli, stackage-install, stackage-sandbox, stackage-setup
@@ -213259,8 +213810,8 @@ self: {
      }:
      mkDerivation {
        pname = "standalone-haddock";
-       version = "1.1.4.5";
-       sha256 = "1ssfxkzjpprjn9smrgrgskr07zjj8zjs2wgvzcfpk9j0nvps0p9d";
+       version = "1.3.0.0";
+       sha256 = "1s9b2frpsgvc7nghi314adga8z8rmj1x40j7cic2m3m88nqz3g77";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -214777,57 +215328,6 @@ self: {
      }:
      mkDerivation {
        pname = "store";
-       version = "0.5.0.1";
-       sha256 = "0dpm7752p8lhlwq5nlhqxwq1c5nyi97rnj83j2im3i9wvs2qb3i3";
-       libraryHaskellDepends = [
-         array async base base-orphans base64-bytestring bifunctors
-         bytestring containers contravariant cryptohash deepseq directory
-         filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp
-         lifted-base monad-control mono-traversable network primitive
-         resourcet safe semigroups smallcheck store-core syb
-         template-haskell text th-lift th-lift-instances th-orphans
-         th-reify-many th-utilities time transformers unordered-containers
-         vector void
-       ];
-       testHaskellDepends = [
-         array async base base-orphans base64-bytestring bifunctors
-         bytestring cereal cereal-vector clock containers contravariant
-         criterion cryptohash deepseq directory filepath free ghc-prim
-         hashable hspec hspec-smallcheck integer-gmp lifted-base
-         monad-control mono-traversable network primitive resourcet safe
-         semigroups smallcheck store-core syb template-haskell text th-lift
-         th-lift-instances th-orphans th-reify-many th-utilities time
-         transformers unordered-containers vector vector-binary-instances
-         void weigh
-       ];
-       benchmarkHaskellDepends = [
-         array async base base-orphans base64-bytestring bifunctors
-         bytestring containers contravariant criterion cryptohash deepseq
-         directory filepath free ghc-prim hashable hspec hspec-smallcheck
-         integer-gmp lifted-base monad-control mono-traversable network
-         primitive resourcet safe semigroups smallcheck store-core syb
-         template-haskell text th-lift th-lift-instances th-orphans
-         th-reify-many th-utilities time transformers unordered-containers
-         vector void
-       ];
-       description = "Fast binary serialization";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "store_0_5_1_0" = callPackage
-    ({ mkDerivation, array, async, base, base-orphans
-     , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector
-     , clock, containers, contravariant, criterion, cryptohash, deepseq
-     , directory, filepath, free, ghc-prim, hashable, hspec
-     , hspec-smallcheck, integer-gmp, lifted-base, monad-control
-     , mono-traversable, network, primitive, resourcet, safe, semigroups
-     , smallcheck, store-core, syb, template-haskell, text, th-lift
-     , th-lift-instances, th-orphans, th-reify-many, th-utilities, time
-     , transformers, unordered-containers, vector
-     , vector-binary-instances, void, weigh
-     }:
-     mkDerivation {
-       pname = "store";
        version = "0.5.1.0";
        sha256 = "0r15b04vxfca45a0rv1n4lcd6zpxhlhc9gmg9if17r1bm63x59hr";
        revision = "1";
@@ -214865,7 +215365,6 @@ self: {
        ];
        description = "Fast binary serialization";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "store-core" = callPackage
@@ -215320,6 +215819,8 @@ self: {
        ];
        description = "Streaming interface for Brotli (RFC7932) compression";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "streaming-bytestring" = callPackage
@@ -215503,6 +216004,8 @@ self: {
        ];
        description = "Streaming interface for LZMA/XZ compression";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "streaming-osm" = callPackage
@@ -220052,6 +220555,8 @@ self: {
        pname = "tagged";
        version = "0.8.6";
        sha256 = "1pciqzxf9ncv954v4r527xkxkn7r5hcr13mfw5dg1xjci3qdw5md";
+       revision = "1";
+       editedCabalFile = "070xwfw7y81hd63il76dmwbdl9ca1rd07c54zynfx6vpr4wyx4vh";
        libraryHaskellDepends = [
          base deepseq template-haskell transformers
        ];
@@ -221380,6 +221885,8 @@ self: {
        testHaskellDepends = [ base QuickCheck tasty ];
        description = "Pre-built tasty trees for checking lawful class properties using QuickCheck";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tasty-rerun" = callPackage
@@ -224401,7 +224908,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "text-show_3_8" = callPackage
+  "text-show_3_8_1" = callPackage
     ({ mkDerivation, array, base, base-compat-batteries, base-orphans
      , bifunctors, bytestring, bytestring-builder, containers
      , contravariant, criterion, deepseq, deriving-compat
@@ -224412,10 +224919,8 @@ self: {
      }:
      mkDerivation {
        pname = "text-show";
-       version = "3.8";
-       sha256 = "1yqmyfmnnph28v0c0rkh0z38xaxrrsljf1zg6zccqw322frw9fsi";
-       revision = "1";
-       editedCabalFile = "03q739smdz7z0nnx6pg7d58mmq65y7abhdxwy57akf7pichnw13b";
+       version = "3.8.1";
+       sha256 = "18qaa89pfxqkwk7zpcr7r07b733dvl5ggnmcrl2cf9v9rza1gxiw";
        libraryHaskellDepends = [
          array base base-compat-batteries bifunctors bytestring
          bytestring-builder containers contravariant generic-deriving
@@ -224827,6 +225332,21 @@ self: {
        license = stdenv.lib.licenses.isc;
      }) {};
 
+  "th-abstraction_0_3_1_0" = callPackage
+    ({ mkDerivation, base, containers, ghc-prim, template-haskell }:
+     mkDerivation {
+       pname = "th-abstraction";
+       version = "0.3.1.0";
+       sha256 = "1f81w0gshvc816cf9qz0f19jsrzh6wpzmmy317xrgn63dv61p7jb";
+       libraryHaskellDepends = [
+         base containers ghc-prim template-haskell
+       ];
+       testHaskellDepends = [ base containers template-haskell ];
+       description = "Nicer interface for reified information about data types";
+       license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "th-alpha" = callPackage
     ({ mkDerivation, base, containers, derive, mmorph, mtl, tasty
      , tasty-hunit, tasty-quickcheck, template-haskell, th-desugar
@@ -225106,12 +225626,30 @@ self: {
        pname = "th-lift";
        version = "0.7.11";
        sha256 = "131360zxb0hazbqwbkk6ab2p77jkxr79bwwm618mrwrwkm3x2g6m";
+       revision = "1";
+       editedCabalFile = "0whppp0p9df3fphv6pyg8f70bnm2kpyb3ylznknrklsl5vn2c49d";
+       libraryHaskellDepends = [
+         base ghc-prim template-haskell th-abstraction
+       ];
+       testHaskellDepends = [ base ghc-prim template-haskell ];
+       description = "Derive Template Haskell's Lift class for datatypes";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "th-lift_0_8" = callPackage
+    ({ mkDerivation, base, ghc-prim, template-haskell, th-abstraction
+     }:
+     mkDerivation {
+       pname = "th-lift";
+       version = "0.8";
+       sha256 = "1594v53fqah949nazqrjhy17gxhvc43v2ffrk93bfhdy07wgikia";
        libraryHaskellDepends = [
          base ghc-prim template-haskell th-abstraction
        ];
        testHaskellDepends = [ base ghc-prim template-haskell ];
        description = "Derive Template Haskell's Lift class for datatypes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-lift-instances_0_1_11" = callPackage
@@ -225231,22 +225769,6 @@ self: {
      }:
      mkDerivation {
        pname = "th-reify-many";
-       version = "0.1.8";
-       sha256 = "0hzy6hvhvcd6i60vx5cp2b7ggmnnjh9rx4h8bm8xw4grglcaxjnf";
-       libraryHaskellDepends = [
-         base containers mtl safe template-haskell th-expand-syns
-       ];
-       testHaskellDepends = [ base template-haskell ];
-       description = "Recurseively reify template haskell datatype info";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "th-reify-many_0_1_9" = callPackage
-    ({ mkDerivation, base, containers, mtl, safe, template-haskell
-     , th-expand-syns
-     }:
-     mkDerivation {
-       pname = "th-reify-many";
        version = "0.1.9";
        sha256 = "0hxf56filzqnyrc8q7766vai80y6cgrrbrczx6n93caskl1dv2gq";
        libraryHaskellDepends = [
@@ -225255,7 +225777,6 @@ self: {
        testHaskellDepends = [ base template-haskell ];
        description = "Recurseively reify template haskell datatype info";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-sccs" = callPackage
@@ -226196,25 +226717,6 @@ self: {
      }:
      mkDerivation {
        pname = "tidal";
-       version = "1.0.11";
-       sha256 = "1lpb5233s48hfb9qjwm18c7mv31i8fw0vxqqia8kxlqdhmfcz5ri";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base bifunctors bytestring clock colour containers hosc mwc-random
-         network parsec template-haskell text transformers vector
-       ];
-       testHaskellDepends = [ base containers microspec parsec ];
-       description = "Pattern language for improvised music";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "tidal_1_0_13" = callPackage
-    ({ mkDerivation, base, bifunctors, bytestring, clock, colour
-     , containers, hosc, microspec, mwc-random, network, parsec
-     , template-haskell, text, transformers, vector
-     }:
-     mkDerivation {
-       pname = "tidal";
        version = "1.0.13";
        sha256 = "0m28z3mlp6q51znzjgw1hsfy8g4npsxl8bydm8hm9dslqc7gdi7j";
        enableSeparateDataOutput = true;
@@ -226225,7 +226727,6 @@ self: {
        testHaskellDepends = [ base containers microspec parsec ];
        description = "Pattern language for improvised music";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tidal-midi" = callPackage
@@ -226609,10 +227110,8 @@ self: {
      }:
      mkDerivation {
        pname = "time-parsers";
-       version = "0.1.2.0";
-       sha256 = "091wpcqj1kjvyjgj1y1invn0g5lhdxc92az2bcbwbrpq2c7x8l2f";
-       revision = "3";
-       editedCabalFile = "0im963wjcmwf6ii9a00mbi8lhmx5cy7cs6rmp0qi2j2jddba78j2";
+       version = "0.1.2.1";
+       sha256 = "102k6l9888kbgng045jk170qjbmdnwv2lbzlc12ncybfk2yk7wdv";
        libraryHaskellDepends = [ base parsers template-haskell time ];
        testHaskellDepends = [
          attoparsec base bifunctors parsec parsers tasty tasty-hunit
@@ -227689,16 +228188,17 @@ self: {
      }) {};
 
   "tmp-postgres" = callPackage
-    ({ mkDerivation, base, bytestring, directory, hspec, hspec-discover
-     , network, postgresql-simple, process, temporary, unix
+    ({ mkDerivation, async, base, bytestring, directory, hspec
+     , hspec-discover, network, port-utils, postgresql-simple, process
+     , temporary, unix
      }:
      mkDerivation {
        pname = "tmp-postgres";
-       version = "0.1.1.1";
-       sha256 = "0qz85flbg2ihkcsjdhambgj07xrz75pgpiz8wpapj0gnady5ap9c";
+       version = "0.1.2.2";
+       sha256 = "1lsf8ydf21dql452jk3x6maicip65r4jyb9xd5a98687j798bm6n";
        libraryHaskellDepends = [
-         base bytestring directory network postgresql-simple process
-         temporary unix
+         async base bytestring directory network port-utils
+         postgresql-simple process temporary unix
        ];
        testHaskellDepends = [
          base bytestring directory hspec hspec-discover postgresql-simple
@@ -227707,6 +228207,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Start and stop a temporary postgres for testing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tmpl" = callPackage
@@ -228172,8 +228674,8 @@ self: {
      }:
      mkDerivation {
        pname = "tomlcheck";
-       version = "0.1.0.39";
-       sha256 = "1kz3bbrymh23b8iadq8baircqh11r3q3zv75390ymxiz3ns26vh8";
+       version = "0.1.0.40";
+       sha256 = "0r56fzmngylwcnykhn22hnlaj553m5l29rsjplmlhy3b2rdb10hj";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -229657,6 +230159,20 @@ self: {
        broken = true;
      }) {};
 
+  "treap" = callPackage
+    ({ mkDerivation, base, deepseq, doctest, Glob, hspec, hspec-core
+     , mersenne-random-pure64
+     }:
+     mkDerivation {
+       pname = "treap";
+       version = "0.0.0.0";
+       sha256 = "0zq2jislk5fg7lshya6iivcksxh5wgb54kgllgqqra07w0sp6bd9";
+       libraryHaskellDepends = [ base deepseq mersenne-random-pure64 ];
+       testHaskellDepends = [ base doctest Glob hspec hspec-core ];
+       description = "Efficient implementation of the implicit treap data structure";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "tree-diff" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base
      , base-compat, bytestring, containers, generics-sop, hashable
@@ -234308,8 +234824,8 @@ self: {
      }:
      mkDerivation {
        pname = "universe-dependent-sum";
-       version = "1.1";
-       sha256 = "1psnj7xk5ig7ghvxr6awz60117y6xdwxd8i4jbxivgfrp5ixp85f";
+       version = "1.1.0.1";
+       sha256 = "1mfvfh7rnk8lnd5lgxbhi40y31sar11dmgh5s7g2kgsprzmg1qpi";
        libraryHaskellDepends = [
          base dependent-sum template-haskell th-abstraction transformers
          universe-base
@@ -234319,6 +234835,8 @@ self: {
        ];
        description = "Universe instances for types from dependent-sum";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "universe-instances-base" = callPackage
@@ -237404,17 +237922,15 @@ self: {
   "vec" = callPackage
     ({ mkDerivation, adjunctions, base, base-compat, criterion, deepseq
      , distributive, fin, hashable, inspection-testing, lens
-     , semigroupoids, tagged, vector
+     , semigroupoids, tagged, transformers, vector
      }:
      mkDerivation {
        pname = "vec";
-       version = "0.1";
-       sha256 = "0m70ld5vy96vca4wdm45q1ixwznl3yfj8jzil2kjfkzzac5fym5y";
-       revision = "3";
-       editedCabalFile = "093q5qlhlia12ckhvax322lyy3sb554pg46ghabvsvx8znixw2hh";
+       version = "0.1.1";
+       sha256 = "1ryc6jshm26dh21xlf4wg4fhkw035bxx4smd3xyisjqm7nncq7n5";
        libraryHaskellDepends = [
          adjunctions base base-compat deepseq distributive fin hashable lens
-         semigroupoids
+         semigroupoids transformers
        ];
        testHaskellDepends = [ base fin inspection-testing tagged ];
        benchmarkHaskellDepends = [ base criterion fin vector ];
@@ -237666,6 +238182,8 @@ self: {
        doHaddock = false;
        description = "Storable vectors with cpu-independent representation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vector-extras" = callPackage
@@ -239318,21 +239836,20 @@ self: {
     ({ mkDerivation, array, attoparsec, attoparsec-conduit, base
      , bytestring, case-insensitive, conduit, conduit-extra, containers
      , data-default-class, directory, doctest, filepath, hspec, HTTP
-     , http-client, http-conduit, http-date, http-types, io-choice
-     , lifted-base, mime-types, network, process, sockaddr, static-hash
-     , text, transformers, unix, wai, wai-conduit, warp, word8
+     , http-client, http-conduit, http-date, http-types, mime-types
+     , network, process, sockaddr, static-hash, text, transformers, unix
+     , wai, wai-conduit, warp, word8
      }:
      mkDerivation {
        pname = "wai-app-file-cgi";
-       version = "3.1.6";
-       sha256 = "1w2hmy0q8dvg575sxmc69f9x7pcf1fx6lypzxsaxyfyazvhi4krc";
+       version = "3.1.7";
+       sha256 = "17cj50p16adyzqr28f28ll64g3gr8ri756dngrdgly0g7060fg53";
        libraryHaskellDepends = [
          array attoparsec attoparsec-conduit base bytestring
          case-insensitive conduit conduit-extra containers
          data-default-class directory filepath http-client http-conduit
-         http-date http-types io-choice lifted-base mime-types network
-         process sockaddr static-hash text transformers unix wai wai-conduit
-         warp word8
+         http-date http-types mime-types network process sockaddr
+         static-hash text transformers unix wai wai-conduit warp word8
        ];
        testHaskellDepends = [
          base bytestring conduit conduit-extra directory doctest filepath
@@ -239578,6 +240095,36 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wai-extra_3_0_26" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
+     , bytestring, case-insensitive, containers, cookie
+     , data-default-class, deepseq, directory, fast-logger, hspec
+     , http-types, http2, 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.26";
+       sha256 = "1vax87kchm92az0f4axn793bavp8pwjh7a9mc1lwwwni678h35gq";
+       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 http2 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 http2 HUnit resourcet text time transformers wai zlib
+       ];
+       description = "Provides some basic WAI handlers and middleware";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-frontend-monadcgi" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, cgi
      , containers, http-types, transformers, wai
@@ -241153,13 +241700,13 @@ self: {
      , 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
+     , QuickCheck, simple-sendfile, stm, streaming-commons, text, time
+     , transformers, unix, unix-compat, vault, wai, word8
      }:
      mkDerivation {
        pname = "warp";
-       version = "3.2.26";
-       sha256 = "1s83313cs6w84a8yfwqkixfz4a94aszma4phsqv7x1ivi9b3i8sc";
+       version = "3.2.27";
+       sha256 = "0p2w88q0zd55ms20qylipbi0qzbf324i9r8b9qqxyds5yc1anq76";
        libraryHaskellDepends = [
          array async auto-update base bsb-http-chunked bytestring
          case-insensitive containers ghc-prim hashable http-date http-types
@@ -241170,7 +241717,7 @@ self: {
          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
+         lifted-base network process QuickCheck simple-sendfile stm
          streaming-commons text time transformers unix unix-compat vault wai
          word8
        ];
@@ -241248,8 +241795,8 @@ self: {
      }:
      mkDerivation {
        pname = "warp-tls";
-       version = "3.2.4.3";
-       sha256 = "17gj295fr98l7mkz2gdz6kahdnmja0sql3kvy2zab6q168g53kc4";
+       version = "3.2.5";
+       sha256 = "1z98jxn1l9mp6hh2jja6cz48nx8zvp5iqrr23wmbp235vva4llmf";
        libraryHaskellDepends = [
          base bytestring cryptonite data-default-class network
          streaming-commons tls tls-session-manager wai warp
@@ -241259,24 +241806,6 @@ self: {
      }) {};
 
   "warp-tls-uid" = callPackage
-    ({ mkDerivation, base, bytestring, network, streaming-commons, unix
-     , wai, warp, warp-tls
-     }:
-     mkDerivation {
-       pname = "warp-tls-uid";
-       version = "0.2.0.5";
-       sha256 = "1b3kxpbai9nxqqv9kww4cr1vgaa0cz4fpkd3pfmj0hin10hr6mmq";
-       libraryHaskellDepends = [
-         base bytestring network streaming-commons unix wai warp warp-tls
-       ];
-       testHaskellDepends = [
-         base bytestring network streaming-commons unix wai warp warp-tls
-       ];
-       description = "set group and user id before running server";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "warp-tls-uid_0_2_0_6" = callPackage
     ({ mkDerivation, base, bytestring, data-default, network
      , streaming-commons, tls, unix, wai, warp, warp-tls, x509
      }:
@@ -241294,7 +241823,6 @@ self: {
        ];
        description = "set group and user id before running server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "warped" = callPackage
@@ -244596,8 +245124,8 @@ self: {
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "writer-cps-transformers";
-       version = "0.5.6.0";
-       sha256 = "132qd8rvvksjr8klvgr3y2acmlsw9jvirlfl8hdm3ipi4i7hy4fr";
+       version = "0.5.6.1";
+       sha256 = "071jiwdpjh5d7nm5jfgmk0lgpms0x3bijwjh25nnpy7q7lfczskn";
        libraryHaskellDepends = [ base transformers ];
        doHaddock = false;
        description = "WriteT and RWST monad transformers";
@@ -244893,6 +245421,21 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wuss_1_1_13" = callPackage
+    ({ mkDerivation, base, bytestring, connection, network, websockets
+     }:
+     mkDerivation {
+       pname = "wuss";
+       version = "1.1.13";
+       sha256 = "16ll4wfk3i570id7ki5ab34q5wwzgr5k7fqmx8hvnxmdsr8h85cy";
+       libraryHaskellDepends = [
+         base bytestring connection network websockets
+       ];
+       description = "Secure WebSocket (WSS) clients";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wx" = callPackage
     ({ mkDerivation, base, stm, time, wxcore }:
      mkDerivation {
@@ -248893,8 +249436,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth-hashdb";
-       version = "1.7.1";
-       sha256 = "1rfz2xanm6d70fx8ywh8j8py8003akzgi10s9n7syqm8kaj2fvqd";
+       version = "1.7.1.1";
+       sha256 = "0a1mz7nfrrgw0dalfbj72kd76nbgr9in63zrpijl4nd1p1j99br5";
        libraryHaskellDepends = [
          aeson base bytestring persistent text yesod-auth yesod-core
          yesod-form yesod-persistent
@@ -249538,8 +250081,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-fay";
-       version = "0.9.0";
-       sha256 = "186mxq6b5hl0ylsx9lajisywkc9klvbfbhq39pq497wk519ppc8s";
+       version = "0.10.0";
+       sha256 = "1qpcfiscwhb5rcdm335v6qi17rjxc0zc0qpv26lmyikdslj4jr9s";
        libraryHaskellDepends = [
          aeson base bytestring data-default directory fay fay-dom filepath
          monad-loops process pureMD5 shakespeare template-haskell text
@@ -249918,26 +250461,6 @@ self: {
 
   "yesod-paginator" = callPackage
     ({ mkDerivation, base, blaze-markup, doctest, hspec, path-pieces
-     , persistent, safe, text, transformers, uri-encode, yesod-core
-     , yesod-test
-     }:
-     mkDerivation {
-       pname = "yesod-paginator";
-       version = "1.1.0.1";
-       sha256 = "140b4cikshl5f229awnp5jcbnyln0bmzlqjfcwxzxssxwnviy93f";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base blaze-markup path-pieces persistent safe text transformers
-         uri-encode yesod-core
-       ];
-       testHaskellDepends = [ base doctest hspec yesod-core yesod-test ];
-       description = "A pagination approach for yesod";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "yesod-paginator_1_1_0_2" = callPackage
-    ({ mkDerivation, base, blaze-markup, doctest, hspec, path-pieces
      , persistent, QuickCheck, quickcheck-classes, safe, text
      , transformers, uri-encode, yesod-core, yesod-test
      }:
@@ -249957,7 +250480,6 @@ self: {
        ];
        description = "A pagination approach for yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-paypal-rest" = callPackage
@@ -250004,27 +250526,6 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-persistent";
-       version = "1.6.0.1";
-       sha256 = "0kxxm43d64lp4p7kmmpc9c0rany9nblf5dd1424m8wg3105cr2kl";
-       libraryHaskellDepends = [
-         base blaze-builder conduit persistent persistent-template
-         resource-pool resourcet transformers yesod-core
-       ];
-       testHaskellDepends = [
-         base blaze-builder conduit hspec persistent persistent-sqlite text
-         wai-extra yesod-core
-       ];
-       description = "Some helpers for using Persistent from Yesod";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-persistent_1_6_0_2" = callPackage
-    ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent
-     , persistent-sqlite, persistent-template, resource-pool, resourcet
-     , text, transformers, wai-extra, yesod-core
-     }:
-     mkDerivation {
-       pname = "yesod-persistent";
        version = "1.6.0.2";
        sha256 = "17adw0aaj29ia7ii3jka301442860b5wvfrms079q973gzahz5fd";
        libraryHaskellDepends = [
@@ -250037,7 +250538,6 @@ self: {
        ];
        description = "Some helpers for using Persistent from Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-platform" = callPackage
@@ -250615,6 +251115,32 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-test_1_6_6_1" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
+     , bytestring, case-insensitive, conduit, containers, cookie, hspec
+     , hspec-core, html-conduit, http-types, HUnit, network, pretty-show
+     , semigroups, text, time, transformers, unliftio, wai, wai-extra
+     , xml-conduit, xml-types, yesod-core, yesod-form
+     }:
+     mkDerivation {
+       pname = "yesod-test";
+       version = "1.6.6.1";
+       sha256 = "1mr0ad6z6s9rnxnv5ayg8xr93xfx9gxm8zym0866339w7p292wqd";
+       libraryHaskellDepends = [
+         attoparsec base blaze-builder blaze-html bytestring
+         case-insensitive conduit containers cookie hspec-core html-conduit
+         http-types HUnit network pretty-show semigroups text time
+         transformers wai wai-extra xml-conduit xml-types yesod-core
+       ];
+       testHaskellDepends = [
+         base bytestring containers cookie hspec html-conduit http-types
+         HUnit text unliftio wai wai-extra xml-conduit yesod-core yesod-form
+       ];
+       description = "integration testing for WAI/Yesod Applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-test-json" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, hspec
      , http-types, HUnit, text, transformers, wai, wai-test
@@ -252405,32 +252931,6 @@ self: {
      }:
      mkDerivation {
        pname = "zip-archive";
-       version = "0.4";
-       sha256 = "06fs9959w807iy4xmngpnv1rps5sr1kqr2pd7b3iw6xfjlfskgjz";
-       revision = "1";
-       editedCabalFile = "1y4i0xblglhkj6nv2p0r2xgw8gqrhnsamkh7d389z68sf9zpgl6c";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         array base binary bytestring containers digest directory filepath
-         mtl pretty text time unix zlib
-       ];
-       testHaskellDepends = [
-         base bytestring directory filepath HUnit process temporary time
-         unix
-       ];
-       testToolDepends = [ unzip which ];
-       description = "Library for creating and modifying zip archives";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) unzip; inherit (pkgs) which;};
-
-  "zip-archive_0_4_1" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, containers
-     , digest, directory, filepath, HUnit, mtl, pretty, process
-     , temporary, text, time, unix, unzip, which, zlib
-     }:
-     mkDerivation {
-       pname = "zip-archive";
        version = "0.4.1";
        sha256 = "1cdix5mnxrbs7b2kivhdydhfzgxidd9dqlw71mdw5p21cabwkmf5";
        revision = "1";
@@ -252448,7 +252948,6 @@ self: {
        testToolDepends = [ unzip which ];
        description = "Library for creating and modifying zip archives";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) unzip; inherit (pkgs) which;};
 
   "zip-conduit" = callPackage
diff --git a/pkgs/development/idris-modules/glfw.nix b/pkgs/development/idris-modules/glfw.nix
index 535f549a5ebe..882058bb1856 100644
--- a/pkgs/development/idris-modules/glfw.nix
+++ b/pkgs/development/idris-modules/glfw.nix
@@ -10,8 +10,14 @@ build-idris-package  {
 
   idrisDeps = [ effects ];
 
+  nativeBuildInputs = [ pkgs.pkgconfig ];
   extraBuildInputs = [ pkgs.glfw ];
 
+  postPatch = ''
+    substituteInPlace src/MakefileGlfw \
+      --replace glfw3 "glfw3 gl"
+  '';
+
   src = fetchFromGitHub {
     owner = "eckart";
     repo = "glfw-idris";
diff --git a/pkgs/development/idris-modules/idris-wrapper.nix b/pkgs/development/idris-modules/idris-wrapper.nix
index f395bcd95d7c..4e1d2f9c82eb 100644
--- a/pkgs/development/idris-modules/idris-wrapper.nix
+++ b/pkgs/development/idris-modules/idris-wrapper.nix
@@ -1,4 +1,4 @@
-{ lib, symlinkJoin, makeWrapper, idris-no-deps, gcc, gmp }:
+{ stdenv, lib, symlinkJoin, makeWrapper, idris-no-deps, gmp }:
 
 symlinkJoin {
   inherit (idris-no-deps) name src meta;
@@ -6,7 +6,9 @@ symlinkJoin {
   buildInputs = [ makeWrapper ];
   postBuild = ''
     wrapProgram $out/bin/idris \
-      --run 'export IDRIS_CC=''${IDRIS_CC:-${lib.getBin gcc}/bin/gcc}' \
-      --suffix LIBRARY_PATH : ${lib.makeLibraryPath [ gmp ]}
+      --run 'export IDRIS_CC=''${IDRIS_CC:-${stdenv.cc}/bin/cc}' \
+      --set NIX_CC_WRAPPER_${stdenv.cc.infixSalt}_TARGET_HOST 1 \
+      --prefix NIX_CFLAGS_COMPILE " " "-I${lib.getDev gmp}/include" \
+      --prefix NIX_CFLAGS_LINK " " "-L${lib.getLib gmp}/lib"
   '';
 }
diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix
deleted file mode 100644
index b2948b392d5e..000000000000
--- a/pkgs/development/interpreters/lua-5/5.1.nix
+++ /dev/null
@@ -1,76 +0,0 @@
-{ stdenv, fetchurl, readline
-, self
-, callPackage
-, packageOverrides ? (self: super: {})
-}:
-
-let
-  dsoPatch = fetchurl {
-    url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/lua-arch.patch?h=packages/lua51";
-    sha256 = "11fcyb4q55p4p7kdb8yp85xlw8imy14kzamp2khvcyxss4vw8ipw";
-    name = "lua-arch.patch";
-  };
-  luaPackages = callPackage ../../lua-modules {lua=self; overrides=packageOverrides;};
-in
-stdenv.mkDerivation rec {
-  name = "lua-${version}";
-  version = "5.1.5";
-  luaversion = "5.1";
-
-  src = fetchurl {
-    url = "https://www.lua.org/ftp/${name}.tar.gz";
-    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 ])
-    ++ [ ./5.1.0004-Fix-stack-overflow-in-vararg-functions.patch ];
-
-  configurePhase =
-    if stdenv.isDarwin
-    then ''
-    makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2" LDFLAGS="" CC="$CC" )
-    installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.5.1.5.dylib" INSTALL_DATA='cp -d' )
-  '' else ''
-    makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC" LDFLAGS="-fPIC" CC="$CC" AR="$AR q" RANLIB="$RANLIB" )
-    installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.5.1 liblua.so.5.1.5" INSTALL_DATA='cp -d' )
-  '';
-
-  postInstall = ''
-    mkdir -p "$out/share/doc/lua" "$out/lib/pkgconfig"
-    sed <"etc/lua.pc" >"$out/lib/pkgconfig/lua.pc" -e "s|^prefix=.*|prefix=$out|"
-    mv "doc/"*.{gif,png,css,html} "$out/share/doc/lua/"
-    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";
-    longDescription = ''
-      Lua combines simple procedural syntax with powerful data
-      description constructs based on associative arrays and extensible
-      semantics. Lua is dynamically typed, runs by interpreting bytecode
-      for a register-based virtual machine, and has automatic memory
-      management with incremental garbage collection, making it ideal
-      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
deleted file mode 100644
index e89a2cbece6d..000000000000
--- a/pkgs/development/interpreters/lua-5/5.2.nix
+++ /dev/null
@@ -1,95 +0,0 @@
-{ stdenv, fetchurl, readline
-# compiles compatibility layer with lua5.1
-, compat ? false
-, callPackage
-, self
-, packageOverrides ? (self: super: {})
-}:
-
-let
-  dsoPatch = fetchurl {
-    url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/liblua.so.patch?h=packages/lua52";
-    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";
-  };
-
-  buildInputs = [ readline ];
-
-  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 ''
-    makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${luaversion} R=${version}  CC="$CC" )
-    installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.${version}.dylib" INSTALL_DATA='cp -d' )
-  '' else ''
-    makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${luaversion} R=${version} CC="$CC" AR="$AR q" RANLIB="$RANLIB" )
-    installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.${luaversion} liblua.so.${version}" INSTALL_DATA='cp -d' )
-  '';
-
-  postInstall = ''
-    mkdir -p "$out/share/doc/lua" "$out/lib/pkgconfig"
-    mv "doc/"*.{gif,png,css,html} "$out/share/doc/lua/"
-    rmdir $out/{share,lib}/lua/${luaversion} $out/{share,lib}/lua
-    mkdir -p "$out/lib/pkgconfig"
-    cat >"$out/lib/pkgconfig/lua.pc" <<EOF
-    prefix=$out
-    libdir=$out/lib
-    includedir=$out/include
-    INSTALL_BIN=$out/bin
-    INSTALL_INC=$out/include
-    INSTALL_LIB=$out/lib
-    INSTALL_MAN=$out/man/man1
-
-    Name: Lua
-    Description: An Extensible Extension Language
-    Version: ${version}
-    Requires:
-    Libs: -L$out/lib -llua -lm
-    Cflags: -I$out/include
-    EOF
-  '';
-
-  meta = {
-    homepage = http://www.lua.org;
-    description = "Powerful, fast, lightweight, embeddable scripting language";
-    longDescription = ''
-      Lua combines simple procedural syntax with powerful data
-      description constructs based on associative arrays and extensible
-      semantics. Lua is dynamically typed, runs by interpreting bytecode
-      for a register-based virtual machine, and has automatic memory
-      management with incremental garbage collection, making it ideal
-      for configuration, scripting, and rapid prototyping.
-    '';
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.unix;
-  };
-}
diff --git a/pkgs/development/interpreters/lua-5/build-lua-package.nix b/pkgs/development/interpreters/lua-5/build-lua-package.nix
index 6b356831b3bb..bc41d86256b2 100644
--- a/pkgs/development/interpreters/lua-5/build-lua-package.nix
+++ b/pkgs/development/interpreters/lua-5/build-lua-package.nix
@@ -150,6 +150,9 @@ builtins.removeAttrs attrs ["disabled" "checkInputs"] // {
   installPhase = attrs.installPhase or ''
     runHook preInstall
 
+    # work around failing luarocks test for Write access
+    mkdir -p $out
+
     # luarocks make assumes sources are available in cwd
     # After the build is complete, it also installs the rock.
     # If no argument is given, it looks for a rockspec in the current directory
diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix
new file mode 100644
index 000000000000..fb709227180f
--- /dev/null
+++ b/pkgs/development/interpreters/lua-5/default.nix
@@ -0,0 +1,65 @@
+# similar to interpreters/python/default.nix
+{ stdenv, lib, callPackage, fetchurl }:
+let
+  dsoPatch51 = fetchurl {
+    url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/lua-arch.patch?h=packages/lua51";
+    sha256 = "11fcyb4q55p4p7kdb8yp85xlw8imy14kzamp2khvcyxss4vw8ipw";
+    name = "lua-arch.patch";
+  };
+
+  dsoPatch52 = fetchurl {
+    url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/liblua.so.patch?h=packages/lua52";
+    sha256 = "1by1dy4ql61f5c6njq9ibf9kaqm3y633g2q8j54iyjr4cxvqwqz9";
+    name = "lua-arch.patch";
+  };
+
+in rec {
+
+  lua5_3 = callPackage ./interpreter.nix {
+    sourceVersion = { major = "5"; minor = "3"; patch = "5"; };
+    hash = "0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac";
+    patches = lib.optionals stdenv.isDarwin [ ./5.2.darwin.patch ] ;
+    postConfigure = lib.optionalString (!stdenv.isDarwin) ''
+      cat ${./lua-5.3-dso.make} >> src/Makefile
+      sed -e 's/ALL_T *= */& $(LUA_SO)/' -i src/Makefile
+    '';
+
+    postBuild = stdenv.lib.optionalString (!stdenv.isDarwin) ''
+      ( cd src; make $makeFlags "''${makeFlagsArray[@]}" liblua.so )
+    '';
+  };
+
+  lua5_3_compat = lua5_3.override({
+    compat = true;
+  });
+
+
+  lua5_2 = callPackage ./interpreter.nix {
+    sourceVersion = { major = "5"; minor = "2"; patch = "4"; };
+    hash = "0jwznq0l8qg9wh5grwg07b5cy3lzngvl5m2nl1ikp6vqssmf9qmr";
+    patches = if stdenv.isDarwin then [ ./5.2.darwin.patch ] else [ dsoPatch52 ];
+  };
+
+  lua5_2_compat = lua5_2.override({
+    compat = true;
+  });
+
+
+  lua5_1 = callPackage ./interpreter.nix {
+    sourceVersion = { major = "5"; minor = "1"; patch = "5"; };
+    hash = "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333";
+    patches = (if stdenv.isDarwin then [ ./5.1.darwin.patch ] else [ dsoPatch51 ])
+      ++ [ ./5.1.0004-Fix-stack-overflow-in-vararg-functions.patch ];
+  };
+
+  luajit_2_0 = import ../luajit/2.0.nix {
+    self = luajit_2_0;
+    inherit callPackage lib;
+  };
+
+  luajit_2_1 = import ../luajit/2.1.nix {
+    self = luajit_2_1;
+    inherit callPackage lib;
+  };
+
+}
diff --git a/pkgs/development/interpreters/lua-5/5.3.nix b/pkgs/development/interpreters/lua-5/interpreter.nix
index c1fdc0fd9904..26db917c9002 100644
--- a/pkgs/development/interpreters/lua-5/5.3.nix
+++ b/pkgs/development/interpreters/lua-5/interpreter.nix
@@ -1,19 +1,24 @@
-{ stdenv, fetchurl, readline, compat ? false
+{ stdenv, fetchurl, readline
+, compat ? false
 , callPackage
-, self
 , packageOverrides ? (self: super: {})
+, sourceVersion
+, hash
+, patches ? []
+, postConfigure ? null
+, postBuild ? null
 }:
 let
-  luaPackages = callPackage ../../lua-modules {lua=self; overrides=packageOverrides;};
-in
-stdenv.mkDerivation rec {
-  name = "lua-${version}";
-  luaversion = "5.3";
-  version = "${luaversion}.5";
+luaPackages = callPackage ../../lua-modules {lua=self; overrides=packageOverrides;};
+
+self = stdenv.mkDerivation rec {
+  pname = "lua";
+  luaversion = with sourceVersion; "${major}.${minor}";
+  version = "${luaversion}.${sourceVersion.patch}";
 
   src = fetchurl {
-    url = "https://www.lua.org/ftp/${name}.tar.gz";
-    sha256 = "0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac";
+    url = "https://www.lua.org/ftp/${pname}-${luaversion}.tar.gz";
+    sha256 = hash;
   };
 
   LuaPathSearchPaths    = luaPackages.getLuaPathList luaversion;
@@ -22,29 +27,43 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ readline ];
 
-  patches = if stdenv.isDarwin then [ ./5.2.darwin.patch ] else [];
-
-  configurePhase =
-    if stdenv.isDarwin
-    then ''
-    makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${luaversion} R=${version}  CC="$CC" )
-    installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.${version}.dylib" INSTALL_DATA='cp -d' )
-  '' else ''
-    makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${luaversion} R=${version} CC="$CC" AR="$AR q" RANLIB="$RANLIB" )
-    installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.${luaversion} liblua.so.${version}" INSTALL_DATA='cp -d' )
-    cat ${./lua-5.3-dso.make} >> src/Makefile
-    sed -e 's/ALL_T *= */& $(LUA_SO)/' -i src/Makefile
-  '';
+  inherit patches;
+
+  # see configurePhase for additional flags (with space)
+  makeFlags = [
+    "INSTALL_TOP=${placeholder "out"}"
+    "INSTALL_MAN=${placeholder "out"}/share/man/man1"
+    "R=${version}"
+    "LDFLAGS=-fPIC"
+    "V=${luaversion}"
+  ] ++ (if stdenv.isDarwin then [
+    "PLAT=macosx"
+  ] else [
+    "PLAT=linux"
+  ])
+  ;
+
+  configurePhase = ''
+    runHook preConfigure
 
-  postBuild = stdenv.lib.optionalString (! stdenv.isDarwin) ''
-    ( cd src; make liblua.so "''${makeFlagsArray[@]}" )
+    makeFlagsArray+=(CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" )
+    makeFlagsArray+=(${stdenv.lib.optionalString stdenv.isDarwin "CC=\"$CC\""})
+
+    installFlagsArray=( TO_BIN="lua luac" INSTALL_DATA='cp -d' \
+      TO_LIB="${if stdenv.isDarwin then "liblua.${version}.dylib" else "liblua.a liblua.so liblua.so.${luaversion} liblua.so.${version}"}" )
+
+    runHook postConfigure
   '';
+  inherit postConfigure;
+
+  inherit postBuild;
 
   postInstall = ''
     mkdir -p "$out/share/doc/lua" "$out/lib/pkgconfig"
     mv "doc/"*.{gif,png,css,html} "$out/share/doc/lua/"
     rmdir $out/{share,lib}/lua/${luaversion} $out/{share,lib}/lua
     mkdir -p "$out/lib/pkgconfig"
+
     cat >"$out/lib/pkgconfig/lua.pc" <<EOF
     prefix=$out
     libdir=$out/lib
@@ -88,4 +107,5 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.unix;
   };
-}
+};
+in self
diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix
index 7727b984d969..73d1e0ea9fd7 100644
--- a/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix
+++ b/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix
@@ -3,10 +3,10 @@
 { stdenv, fetchurl, lib }:
 
 stdenv.mkDerivation rec {
-  name = "python27-docs-html-2.7.3";
+  name = "python27-docs-html-2.7.16";
   src = fetchurl {
-    url = http://docs.python.org/ftp/python/doc/2.7.3/python-2.7.3-docs-html.tar.bz2;
-    sha256 = "1hg92n0mzl9w6j33b2h0bf2vy6fsxnpxfdc3qw760vcm0y00155j";
+    url = http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-html.tar.bz2;
+    sha256 = "1razs1grzhai65ihaiyph8kz6ncjkgp1gsn3c8v7kanf13lqim02";
   };
   installPhase = ''
     mkdir -p $out/share/doc/python27
diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix
index 0c9673b7d7a9..54c0954ae5d0 100644
--- a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix
+++ b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix
@@ -3,10 +3,10 @@
 { stdenv, fetchurl, lib }:
 
 stdenv.mkDerivation rec {
-  name = "python27-docs-pdf-a4-2.7.3";
+  name = "python27-docs-pdf-a4-2.7.16";
   src = fetchurl {
-    url = http://docs.python.org/ftp/python/doc/2.7.3/python-2.7.3-docs-pdf-a4.tar.bz2;
-    sha256 = "13da88panq5b6qfhf8k4dgqgxkg4ydcac5cx69a3f35s1w90xdjr";
+    url = http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-pdf-a4.tar.bz2;
+    sha256 = "14ml1ynrlbhg43737bdsb8k5y39wsffqj4iwhylhb8n8l5dplfdq";
   };
   installPhase = ''
     mkdir -p $out/share/doc/python27
diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix
index 9b0018e7cd78..059908029c0b 100644
--- a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix
+++ b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix
@@ -3,10 +3,10 @@
 { stdenv, fetchurl, lib }:
 
 stdenv.mkDerivation rec {
-  name = "python27-docs-pdf-letter-2.7.3";
+  name = "python27-docs-pdf-letter-2.7.16";
   src = fetchurl {
-    url = http://docs.python.org/ftp/python/doc/2.7.3/python-2.7.3-docs-pdf-letter.tar.bz2;
-    sha256 = "0x41phsdrpivhzkchswsliyx3a10n7gzc9irkrw6rz22j81bfydg";
+    url = http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-pdf-letter.tar.bz2;
+    sha256 = "019i8n48m71mn31v8d85kkwyqfgcgqnqh506y4a7fcgf656bajs0";
   };
   installPhase = ''
     mkdir -p $out/share/doc/python27
diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix
index b7bcfb51d29a..53c5aa3b629b 100644
--- a/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix
+++ b/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix
@@ -3,10 +3,10 @@
 { stdenv, fetchurl, lib }:
 
 stdenv.mkDerivation rec {
-  name = "python27-docs-text-2.7.3";
+  name = "python27-docs-text-2.7.16";
   src = fetchurl {
-    url = http://docs.python.org/ftp/python/doc/2.7.3/python-2.7.3-docs-text.tar.bz2;
-    sha256 = "1rxlb3jhh3892y65i45nk1y2lx981fr22a5hmfkp9gvjvdykjnzp";
+    url = http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-text.tar.bz2;
+    sha256 = "1da7swlykvc013684nywycinfz3v8dqkcmv0zj8p7l5lyi5mq03r";
   };
   installPhase = ''
     mkdir -p $out/share/doc/python27
diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix b/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix
new file mode 100644
index 000000000000..5a6dcc63225e
--- /dev/null
+++ b/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix
@@ -0,0 +1,18 @@
+# This file was generated and will be overwritten by ./generate.sh
+
+{ stdenv, fetchurl, lib }:
+
+stdenv.mkDerivation rec {
+  name = "python37-docs-html-3.7.2";
+  src = fetchurl {
+    url = http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-html.tar.bz2;
+    sha256 = "19wbrawpdam09fmyipfy92sxwn1rl93v8jkfqsfx028qhvzf0422";
+  };
+  installPhase = ''
+    mkdir -p $out/share/doc/python37
+    cp -R ./ $out/share/doc/python37/html
+  '';
+  meta = {
+    maintainers = [ ];
+  };
+}
diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix b/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix
new file mode 100644
index 000000000000..a122d7519f5d
--- /dev/null
+++ b/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix
@@ -0,0 +1,18 @@
+# This file was generated and will be overwritten by ./generate.sh
+
+{ stdenv, fetchurl, lib }:
+
+stdenv.mkDerivation rec {
+  name = "python37-docs-pdf-a4-3.7.2";
+  src = fetchurl {
+    url = http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-pdf-a4.tar.bz2;
+    sha256 = "0vdx762m30hjaabn6w88awcj2qpbz0b6z59zn9wmamd35k59lfba";
+  };
+  installPhase = ''
+    mkdir -p $out/share/doc/python37
+    cp -R ./ $out/share/doc/python37/pdf-a4
+  '';
+  meta = {
+    maintainers = [ ];
+  };
+}
diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix b/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix
new file mode 100644
index 000000000000..4473f2e351c4
--- /dev/null
+++ b/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix
@@ -0,0 +1,18 @@
+# This file was generated and will be overwritten by ./generate.sh
+
+{ stdenv, fetchurl, lib }:
+
+stdenv.mkDerivation rec {
+  name = "python37-docs-pdf-letter-3.7.2";
+  src = fetchurl {
+    url = http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-pdf-letter.tar.bz2;
+    sha256 = "17g57vlyvqx0k916q84q2pcx7y8myw0fda9fvg9kh0ph930c837x";
+  };
+  installPhase = ''
+    mkdir -p $out/share/doc/python37
+    cp -R ./ $out/share/doc/python37/pdf-letter
+  '';
+  meta = {
+    maintainers = [ ];
+  };
+}
diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix b/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix
new file mode 100644
index 000000000000..d9d21bfe3a57
--- /dev/null
+++ b/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix
@@ -0,0 +1,18 @@
+# This file was generated and will be overwritten by ./generate.sh
+
+{ stdenv, fetchurl, lib }:
+
+stdenv.mkDerivation rec {
+  name = "python37-docs-text-3.7.2";
+  src = fetchurl {
+    url = http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-text.tar.bz2;
+    sha256 = "0h50rlr8jclwfxa106b42q2vn2ynp219c4zsy5qz65n5m3b7y1g2";
+  };
+  installPhase = ''
+    mkdir -p $out/share/doc/python37
+    cp -R ./ $out/share/doc/python37/text
+  '';
+  meta = {
+    maintainers = [ ];
+  };
+}
diff --git a/pkgs/development/interpreters/python/cpython/docs/default.nix b/pkgs/development/interpreters/python/cpython/docs/default.nix
index 60e0a0bf1e6e..a538f731473b 100644
--- a/pkgs/development/interpreters/python/cpython/docs/default.nix
+++ b/pkgs/development/interpreters/python/cpython/docs/default.nix
@@ -7,23 +7,35 @@ pythonDocs = {
     python27 = import ./2.7-html.nix {
       inherit stdenv fetchurl lib;
     };
+    python37 = import ./3.7-html.nix {
+      inherit stdenv fetchurl lib;
+    };
   };
   pdf_a4 = {
     recurseForDerivations = true;
     python27 = import ./2.7-pdf-a4.nix {
       inherit stdenv fetchurl lib;
     };
+    python37 = import ./3.7-pdf-a4.nix {
+      inherit stdenv fetchurl lib;
+    };
   };
   pdf_letter = {
     recurseForDerivations = true;
     python27 = import ./2.7-pdf-letter.nix {
       inherit stdenv fetchurl lib;
     };
+    python37 = import ./3.7-pdf-letter.nix {
+      inherit stdenv fetchurl lib;
+    };
   };
   text = {
     recurseForDerivations = true;
     python27 = import ./2.7-text.nix {
       inherit stdenv fetchurl lib;
     };
+    python37 = import ./3.7-text.nix {
+      inherit stdenv fetchurl lib;
+    };
   };
 }; in pythonDocs
diff --git a/pkgs/development/interpreters/python/cpython/docs/generate.sh b/pkgs/development/interpreters/python/cpython/docs/generate.sh
index bebefc10ccd0..a4b2e0893fcd 100755
--- a/pkgs/development/interpreters/python/cpython/docs/generate.sh
+++ b/pkgs/development/interpreters/python/cpython/docs/generate.sh
@@ -2,7 +2,7 @@
 
 TYPES="html pdf-a4 pdf-letter text"
 URL=http://docs.python.org/ftp/python/doc/VERSION/python-VERSION-docs-TYPE.tar.bz2
-VERSIONS=$(curl http://www.python.org/download/releases/ 2>/dev/null | grep "releases/[123456789]"| cut -d/ -f4 |grep -v "^[12].[012345]" |grep -v "^1.6.1")
+VERSIONS=$(for major in 2 3; do curl https://docs.python.org/$major/archives/ 2>/dev/null | perl -l -n -e'/<a href="python-([23].[0-9].[0-9]+)-docs-html.tar.bz2/ && print $1' | tail -n 1; done)
 echo "Generating expressions for:
 ${VERSIONS}
 "
diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix
index b42240a26c4e..c20167138b72 100644
--- a/pkgs/development/libraries/accountsservice/default.nix
+++ b/pkgs/development/libraries/accountsservice/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "accountsservice-${version}";
-  version = "0.6.54";
+  version = "0.6.55";
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz";
-    sha256 = "1b115n0a4yfa06kgxc69qfc1rc0w4frgs3id3029czkrhhn0ds96";
+    sha256 = "16wwd633jak9ajyr1f1h047rmd09fhf3kzjz6g5xjsz0lwcj8azz";
   };
 
   nativeBuildInputs = [ pkgconfig makeWrapper meson ninja python3 ];
diff --git a/pkgs/development/libraries/accountsservice/no-create-dirs.patch b/pkgs/development/libraries/accountsservice/no-create-dirs.patch
index ef1a59b0249f..0333f925d267 100644
--- a/pkgs/development/libraries/accountsservice/no-create-dirs.patch
+++ b/pkgs/development/libraries/accountsservice/no-create-dirs.patch
@@ -1,15 +1,15 @@
 diff --git a/meson_post_install.py b/meson_post_install.py
-index ba95055..17f7926 100644
+index 5cc2dc4..dd27ad5 100644
 --- a/meson_post_install.py
 +++ b/meson_post_install.py
 @@ -9,8 +9,8 @@ localstatedir = os.path.normpath(destdir + os.sep + sys.argv[1])
  # FIXME: meson will not track the creation of these directories
  #        https://github.com/mesonbuild/meson/blob/master/mesonbuild/scripts/uninstall.py#L39
  dst_dirs = [
--  os.path.join(localstatedir, 'lib', 'AccountsService', 'icons'),
--  os.path.join(localstatedir, 'lib', 'AccountsService', 'users'),
-+  #os.path.join(localstatedir, 'lib', 'AccountsService', 'icons'),
-+  #os.path.join(localstatedir, 'lib', 'AccountsService', 'users'),
+-  (os.path.join(localstatedir, 'lib', 'AccountsService', 'icons'), 0o775),
+-  (os.path.join(localstatedir, 'lib', 'AccountsService', 'users'), 0o700),
++#  (os.path.join(localstatedir, 'lib', 'AccountsService', 'icons'), 0o775),
++#  (os.path.join(localstatedir, 'lib', 'AccountsService', 'users'), 0o700),
  ]
  
- for dst_dir in dst_dirs:
+ for (dst_dir, dst_dir_mode) in dst_dirs:
diff --git a/pkgs/development/libraries/appstream/qt.nix b/pkgs/development/libraries/appstream/qt.nix
index c5a251cd5f9f..0013764d7791 100644
--- a/pkgs/development/libraries/appstream/qt.nix
+++ b/pkgs/development/libraries/appstream/qt.nix
@@ -1,5 +1,7 @@
 { stdenv, appstream, qtbase, qttools }:
 
+# TODO: look into using the libraries from the regular appstream derivation as we keep duplicates here
+
 stdenv.mkDerivation rec {
   name = "appstream-qt-${version}";
   inherit (appstream) version src prePatch;
@@ -10,15 +12,6 @@ stdenv.mkDerivation rec {
 
   mesonFlags = appstream.mesonFlags ++ [ "-Dqt=true" ];
 
-  postInstall = ''
-    rm -rf $out/{bin,etc,include/appstream,lib/pkgconfig,lib/libappstream.so*,share}
-  '';
-
-  preFixup = ''
-    patchelf --add-needed ${appstream}/lib/libappstream.so.4 \
-      $out/lib/libAppStreamQt.so
-  '';
-
   meta = appstream.meta // {
     description = "Software metadata handling library - Qt";
  };
diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix
index 3670bfd74784..7ef4feab188d 100644
--- a/pkgs/development/libraries/armadillo/default.nix
+++ b/pkgs/development/libraries/armadillo/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }:
 
 stdenv.mkDerivation rec {
-  version = "9.200.8";
+  version = "9.300.2";
   name = "armadillo-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
-    sha256 = "09fcl6dgxg9203spplr7fwsbms3dvil5h5k3k6vfw7n7sm6ns3p2";
+    sha256 = "1d2nsbspj9vzgzb6w2vgjv2wzidjzc8sr8wkz2zl7wxpgspl299n";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix
index cff960b29a73..7f7ef3336a4c 100644
--- a/pkgs/development/libraries/arrow-cpp/default.nix
+++ b/pkgs/development/libraries/arrow-cpp/default.nix
@@ -1,21 +1,28 @@
-{ stdenv, symlinkJoin, fetchurl, fetchFromGitHub, autoconf, boost, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl, python, rapidjson, snappy, thrift, which, zlib, zstd }:
+{ stdenv, fetchurl, fetchFromGitHub, autoconf, boost, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl, python, rapidjson, snappy, thrift, uriparser, which, zlib, zstd }:
 
 let
   parquet-testing = fetchFromGitHub {
     owner = "apache";
     repo = "parquet-testing";
-    rev = "46ae2605c2de306f5740587107dcf333a527f2d1";
-    sha256 = "07ps745gas2zcfmg56m3vwl63yyzmalnxwb5dc40vd004cx5hdik";
+    rev = "8991d0b58d5a59925c87dd2a0bdb59a5a4a16bd4";
+    sha256 = "00js5d1s98y3ianrvh1ggrd157yfmia4g55jx9xmfcz4a8mcbawx";
+  };
+
+  # Enable non-bundled uriparser
+  # Introduced in https://github.com/apache/arrow/pull/4092
+  Finduriparser_cmake = fetchurl {
+    url = https://raw.githubusercontent.com/apache/arrow/af4f52961209a5f1b43a19483536285c957e3bed/cpp/cmake_modules/Finduriparser.cmake;
+    sha256 = "1cylrw00n2nkc2c49xk9j3rrza351rpravxgpw047vimcw0sk93s";
   };
 in
 
 stdenv.mkDerivation rec {
   name = "arrow-cpp-${version}";
-  version = "0.12.0";
+  version = "0.13.0";
 
   src = fetchurl {
     url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";
-    sha256 = "163s4i2cywq95jgrxbaq48qwmww0ibkq61k1aad4w9z9vpjfgnil";
+    sha256 = "06irh5zx6lc7jjf6hpz1vzk0pvbdx08lcirc8cp8ksb8j7fpfamc";
   };
 
   sourceRoot = "apache-arrow-${version}/cpp";
@@ -26,36 +33,31 @@ stdenv.mkDerivation rec {
     ];
 
   nativeBuildInputs = [ cmake autoconf /* for vendored jemalloc */ ];
-  buildInputs = [ boost double-conversion glog python.pkgs.python python.pkgs.numpy ];
+  buildInputs = [
+    boost brotli double-conversion flatbuffers gflags glog gtest lz4 rapidjson
+    snappy thrift uriparser zlib zstd python.pkgs.python python.pkgs.numpy
+  ];
 
   preConfigure = ''
-    substituteInPlace cmake_modules/FindThrift.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY
-    substituteInPlace cmake_modules/FindBrotli.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY
-    substituteInPlace cmake_modules/FindGLOG.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY
     substituteInPlace cmake_modules/FindLz4.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY
-    substituteInPlace cmake_modules/FindSnappy.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY
+
+    cp ${Finduriparser_cmake} cmake_modules/Finduriparser.cmake
 
     patchShebangs build-support/
-  '';
 
-  BROTLI_HOME = symlinkJoin { name="brotli-wrap"; paths = [ brotli.lib brotli.dev ]; };
-  DOUBLE_CONVERSION_HOME = double-conversion;
-  FLATBUFFERS_HOME = flatbuffers;
-  GFLAGS_HOME = gflags;
-  GLOG_HOME = glog;
-  GTEST_HOME = symlinkJoin { name="gtest-wrap"; paths = [ gtest gtest.dev ]; };
-  LZ4_HOME = symlinkJoin { name="lz4-wrap"; paths = [ lz4 lz4.dev ]; };
-  RAPIDJSON_HOME = rapidjson;
-  SNAPPY_HOME = symlinkJoin { name="snappy-wrap"; paths = [ snappy snappy.dev ]; };
-  THRIFT_HOME = thrift;
-  ZLIB_HOME = symlinkJoin { name="zlib-wrap"; paths = [ zlib zlib.dev ]; };
-  ZSTD_HOME = zstd;
+    # Fix build for ARROW_USE_SIMD=OFF
+    # https://jira.apache.org/jira/browse/ARROW-5007
+    sed -i src/arrow/util/sse-util.h -e '1i#include "arrow/util/logging.h"'
+    sed -i src/arrow/util/neon-util.h -e '1i#include "arrow/util/logging.h"'
+  '';
 
   cmakeFlags = [
     "-DARROW_BUILD_TESTS=ON"
-    "-DARROW_PYTHON=ON"
+    "-DARROW_DEPENDENCY_SOURCE=SYSTEM"
     "-DARROW_PARQUET=ON"
-  ];
+    "-DARROW_PYTHON=ON"
+    "-Duriparser_SOURCE=SYSTEM"
+  ] ++ stdenv.lib.optional (!stdenv.isx86_64) "-DARROW_USE_SIMD=OFF";
 
   doInstallCheck = true;
   PARQUET_TEST_DATA = if doInstallCheck then "${parquet-testing}/data" else null;
diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/pkgs/development/libraries/audio/libmysofa/default.nix
index d802d70adf3b..0f9f5f5aac68 100644
--- a/pkgs/development/libraries/audio/libmysofa/default.nix
+++ b/pkgs/development/libraries/audio/libmysofa/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libmysofa-${version}";
-  version = "0.6";
+  version = "0.7";
 
   src = fetchFromGitHub {
     owner = "hoene";
     repo = "libmysofa";
     rev = "v${version}";
-    sha256 = "160gcmsn6dwaca29bs95nsgjdalwc299lip0h37k3jcbxxkchgsh";
+    sha256 = "0si0z7cfw6xcs3dkrb4zini55xpxwfp27yl8lbx39gx2pf8v2jls";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/dav1d/default.nix b/pkgs/development/libraries/dav1d/default.nix
index 4b94f673a652..49536687a931 100644
--- a/pkgs/development/libraries/dav1d/default.nix
+++ b/pkgs/development/libraries/dav1d/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "dav1d";
-  version = "0.2.2";
+  version = "0.3.0";
 
   src = fetchFromGitLab {
     domain = "code.videolan.org";
     owner = "videolan";
     repo = pname;
     rev = version;
-    sha256 = "130yjr82w0az4xsdcmcjdwkhd0sin5pm6q6s9dyn5yhrwfx1vf0p";
+    sha256 = "08vysa3naqjfvld9w1k6l6hby4xfn4l2gvnfnan498g5nss4050h";
   };
 
   nativeBuildInputs = [ meson ninja nasm ];
diff --git a/pkgs/development/libraries/kproperty/default.nix b/pkgs/development/libraries/kproperty/default.nix
index 455fb5a711c0..c49402b74e86 100644
--- a/pkgs/development/libraries/kproperty/default.nix
+++ b/pkgs/development/libraries/kproperty/default.nix
@@ -7,12 +7,12 @@
 
 mkDerivation rec {
   pname = "kproperty";
-  version = "3.1.0";
+  version = "3.2.0";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://kde/stable/${pname}/src/${name}.tar.xz";
-    sha256 = "18qlwp7ajpx16bd0lfzqfx8y9cbrs8k4nax3cr30wj5sd3l8xpky";
+    sha256 = "1yldfsdamk4dag8dyryjn5n9j2pzi42s79kkafymfnbifhnhrbv7";
   };
 
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kreport/default.nix b/pkgs/development/libraries/kreport/default.nix
index 256989992c5a..fc9c77e8fd61 100644
--- a/pkgs/development/libraries/kreport/default.nix
+++ b/pkgs/development/libraries/kreport/default.nix
@@ -6,12 +6,12 @@
 
 mkDerivation rec {
   pname = "kreport";
-  version = "3.1.0";
+  version = "3.2.0";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://kde/stable/${pname}/src/${name}.tar.xz";
-    sha256 = "0v7krpfx0isij9wzwam28fqn039i4wcznbplvnvl6hsykdi8ar1v";
+    sha256 = "1mycsvkz5rphi9df2i4ch4ykvprd4m76acsdzs3zis2ljrqnsw92";
   };
 
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix
index 160ce9fcabf6..a81e4ff07803 100644
--- a/pkgs/development/libraries/libqmatrixclient/default.nix
+++ b/pkgs/development/libraries/libqmatrixclient/default.nix
@@ -1,26 +1,32 @@
 { stdenv, fetchFromGitHub, cmake
-, qtbase }:
+, qtbase, qtmultimedia }:
 
-stdenv.mkDerivation rec {
-  name = "libqmatrixclient-${version}";
-  version = "0.4.2.1";
+let
+  generic = version: sha256: prefix: stdenv.mkDerivation rec {
+    name = "libqmatrixclient-${version}";
 
-  src = fetchFromGitHub {
-    owner  = "QMatrixClient";
-    repo   = "libqmatrixclient";
-    rev    = "v${version}";
-    sha256 = "056hvp2m74wx72yd8vai18siddj9l8bhrvrkc4ia4cwjsqw02kid";
-  };
+    src = fetchFromGitHub {
+      owner = "QMatrixClient";
+      repo  = "libqmatrixclient";
+      rev   = "${prefix}${version}";
+      inherit sha256;
+    };
 
-  buildInputs = [ qtbase ];
+    buildInputs = [ qtbase qtmultimedia ];
 
-  nativeBuildInputs = [ cmake ];
+    nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib; {
-    description= "A Qt5 library to write cross-platfrom clients for Matrix";
-    homepage = https://matrix.org/docs/projects/sdk/libqmatrixclient.html;
-    license = licenses.lgpl21;
-    platforms = with platforms; linux ++ darwin;
-    maintainers = with maintainers; [ peterhoeg ];
+    meta = with stdenv.lib; {
+      description= "A Qt5 library to write cross-platfrom clients for Matrix";
+      homepage = https://matrix.org/docs/projects/sdk/libqmatrixclient.html;
+      license = licenses.lgpl21;
+      platforms = with platforms; linux ++ darwin;
+      maintainers = with maintainers; [ peterhoeg ];
+    };
   };
+
+in rec {
+  libqmatrixclient_0_4 = generic "0.4.2.1" "056hvp2m74wx72yd8vai18siddj9l8bhrvrkc4ia4cwjsqw02kid" "v";
+  libqmatrixclient_0_5 = generic "0.5.1.2" "0vvpm1vlqfvhgfvavifrj4998g8v33hp5xjf0n8zfsmg4lxlnfg1" "";
+  libqmatrixclient = libqmatrixclient_0_4;
 }
diff --git a/pkgs/development/libraries/nlopt/default.nix b/pkgs/development/libraries/nlopt/default.nix
index bbbc818db63d..e9b89e83907f 100644
--- a/pkgs/development/libraries/nlopt/default.nix
+++ b/pkgs/development/libraries/nlopt/default.nix
@@ -1,12 +1,14 @@
-{ fetchurl, stdenv, octave ? null, cmake }:
+{ stdenv, fetchFromGitHub, cmake, octave ? null }:
 
 stdenv.mkDerivation rec {
-  name = "nlopt-${version}";
-  version = "2.5.0";
+  pname = "nlopt";
+  version = "2.6.1";
 
-  src = fetchurl {
-    url = "https://github.com/stevengj/nlopt/archive/v${version}.tar.gz";
-    sha256 = "1bmlsdzkw8xbigiihffyb0kdaqbyfn7dr8s5pdgavy7z05bpmpf6";
+  src = fetchFromGitHub {
+    owner = "stevengj";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1k6x14lgyfhfqpbs7xx8mrgklp8l6jkkcs39zgi2sj3kg6n0hdc9";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -30,7 +32,6 @@ stdenv.mkDerivation rec {
     description = "Free open-source library for nonlinear optimization";
     license = stdenv.lib.licenses.lgpl21Plus;
     hydraPlatforms = stdenv.lib.platforms.linux;
-    broken = (octave != null);              # cannot cope with Octave 4.x
   };
 
 }
diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix
index 6e190a656f63..79b105a2d1c8 100644
--- a/pkgs/development/libraries/qca-qt5/default.nix
+++ b/pkgs/development/libraries/qca-qt5/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, cmake, openssl, pkgconfig, qtbase }:
 
 stdenv.mkDerivation rec {
-  name = "qca-qt5-2.1.3";
+  pname = "qca-qt5";
+  version = "2.2.1";
 
   src = fetchurl {
-    url = "http://download.kde.org/stable/qca/2.1.3/src/qca-2.1.3.tar.xz";
-    sha256 = "0lz3n652z208daxypdcxiybl0a9fnn6ida0q7fh5f42269mdhgq0";
+    url = "http://download.kde.org/stable/qca/${version}/qca-${version}.tar.xz";
+    sha256 = "00kv1vsrc8fp556hm8s6yw3240vx3l4067q6vfxrb3gdwgcd45np";
   };
 
   buildInputs = [ openssl qtbase ];
diff --git a/pkgs/development/libraries/qca-qt5/move-project.patch b/pkgs/development/libraries/qca-qt5/move-project.patch
index 2a109a3aa3c7..dcecb83d7db9 100644
--- a/pkgs/development/libraries/qca-qt5/move-project.patch
+++ b/pkgs/development/libraries/qca-qt5/move-project.patch
@@ -1,19 +1,17 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 453fd8a..5f6ee11 100644
+index 2f2b5d0..971dee3 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -6,13 +6,13 @@ if(NOT CMAKE_INSTALL_PREFIX)
+@@ -6,10 +6,11 @@ if(NOT CMAKE_INSTALL_PREFIX)
    unset(CMAKE_INSTALL_PREFIX CACHE)
  endif(NOT CMAKE_INSTALL_PREFIX)
-
+ 
 -project(qca)
-
- if(NOT APPLE)
-   cmake_minimum_required(VERSION 2.8.12)
- else()
-   cmake_minimum_required(VERSION 3.0)
- endif()
+ 
+ cmake_minimum_required(VERSION 3.4)
+ 
 +project(qca)
-
++
  set(QCA_LIB_MAJOR_VERSION "2")
- set(QCA_LIB_MINOR_VERSION "1")
+ set(QCA_LIB_MINOR_VERSION "2")
+ set(QCA_LIB_PATCH_VERSION "1")
diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix
index 2e5371e285bc..3de84d859111 100644
--- a/pkgs/development/libraries/qtkeychain/default.nix
+++ b/pkgs/development/libraries/qtkeychain/default.nix
@@ -1,6 +1,7 @@
-{ stdenv, fetchFromGitHub, cmake, qt4 ? null
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt4 ? null
 , withQt5 ? false, qtbase ? null, qttools ? null
 , darwin ? null
+, libsecret
 }:
 
 assert withQt5 -> qtbase != null;
@@ -22,11 +23,14 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ];
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ]
+    ++ stdenv.lib.optional (!stdenv.isDarwin) [ pkgconfig ] # for finding libsecret
+  ;
 
-  buildInputs = if withQt5 then [ qtbase qttools ] else [ qt4 ]
+  buildInputs = stdenv.lib.optional (!stdenv.isDarwin) [ libsecret ]
+    ++ (if withQt5 then [ qtbase qttools ] else [ qt4 ])
     ++ stdenv.lib.optional stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
-         CoreFoundation Security
+      CoreFoundation Security
     ])
   ;
 
diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix
index 32c93b192ef0..36077d71126a 100644
--- a/pkgs/development/libraries/snappy/default.nix
+++ b/pkgs/development/libraries/snappy/default.nix
@@ -19,6 +19,11 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_SKIP_BUILD_RPATH=OFF" ];
 
+  postInstall = ''
+    substituteInPlace "$out"/lib/cmake/Snappy/SnappyTargets.cmake \
+      --replace 'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/include"' 'INTERFACE_INCLUDE_DIRECTORIES "'$dev'"'
+  '';
+
   checkTarget = "test";
 
   doCheck = true;
diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix
index a4f99b942eae..89efdc006a54 100644
--- a/pkgs/development/libraries/uriparser/default.nix
+++ b/pkgs/development/libraries/uriparser/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
       API documentation is available on uriparser website.
     '';
     license = licenses.bsd3;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ bosu ];
   };
 }
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index db3f41edaffa..c8fc051f7a97 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -14,13 +14,13 @@ ansicolors = buildLuarocksPackage {
   pname = "ansicolors";
   version = "1.0.2-3";
 
-  src =  fetchurl {
+  src = fetchurl {
       url    = https://luarocks.org/ansicolors-1.0.2-3.src.rock;
       sha256 = "1mhmr090y5394x1j8p44ws17sdwixn5a0r4i052bkfgk3982cqfz";
-   };
+  };
   disabled = ( luaOlder "5.1");
-  propagatedBuildInputs = [lua  ];
-  buildType="builtin";
+  propagatedBuildInputs = [ lua ];  
+  buildType = "builtin";
 
   meta = {
     homepage = "https://github.com/kikito/ansicolors.lua";
@@ -34,13 +34,13 @@ argparse = buildLuarocksPackage {
   pname = "argparse";
   version = "0.6.0-1";
 
-  src =  fetchurl {
+  src = fetchurl {
       url    = https://luarocks.org/argparse-0.6.0-1.src.rock;
       sha256 = "10ic5wppyghd1lmgwgl0lb40pv8z9fi9i87080axxg8wsr19y0p4";
-   };
+  };
   disabled = ( luaOlder "5.1") || ( luaAtLeast "5.4");
-  propagatedBuildInputs = [lua  ];
-  buildType="builtin";
+  propagatedBuildInputs = [ lua ];  
+  buildType = "builtin";
 
   meta = {
     homepage = "https://github.com/mpeterv/argparse";
@@ -54,13 +54,13 @@ basexx = buildLuarocksPackage {
   pname = "basexx";
   version = "0.4.0-1";
 
-  src =  fetchurl {
+  src = fetchurl {
       url    = https://luarocks.org/basexx-0.4.0-1.src.rock;
       sha256 = "1px8yrxg1qkk3kzdqj3siry742jdv4ysp2dmicxi15mkynqpjlzz";
-   };
+  };
   disabled = ( luaOlder "5.1");
-  propagatedBuildInputs = [lua  ];
-  buildType="builtin";
+  propagatedBuildInputs = [ lua ];  
+  buildType = "builtin";
 
   meta = {
     homepage = "https://github.com/aiq/basexx";
@@ -74,13 +74,13 @@ dkjson = buildLuarocksPackage {
   pname = "dkjson";
   version = "2.5-2";
 
-  src =  fetchurl {
+  src = fetchurl {
       url    = https://luarocks.org/dkjson-2.5-2.src.rock;
       sha256 = "1qy9bzqnb9pf9d48hik4iq8h68aw3270kmax7mmpvvpw7kkyp483";
-   };
+  };
   disabled = ( luaOlder "5.1") || ( luaAtLeast "5.4");
-  propagatedBuildInputs = [lua  ];
-  buildType="builtin";
+  propagatedBuildInputs = [ lua ];  
+  buildType = "builtin";
 
   meta = {
     homepage = "http://dkolf.de/src/dkjson-lua.fsl/";
@@ -94,13 +94,13 @@ fifo = buildLuarocksPackage {
   pname = "fifo";
   version = "0.2-0";
 
-  src =  fetchurl {
+  src = fetchurl {
       url    = https://luarocks.org/fifo-0.2-0.src.rock;
       sha256 = "082c5g1m8brnsqj5gnjs65bm7z50l6b05cfwah14lqaqsr5a5pjk";
-   };
-
-  propagatedBuildInputs = [lua  ];
-  buildType="builtin";
+  };
+  
+  propagatedBuildInputs = [ lua ];  
+  buildType = "builtin";
 
   meta = {
     homepage = "https://github.com/daurnimator/fifo.lua";
@@ -114,13 +114,13 @@ inspect = buildLuarocksPackage {
   pname = "inspect";
   version = "3.1.1-0";
 
-  src =  fetchurl {
+  src = fetchurl {
       url    = https://luarocks.org/inspect-3.1.1-0.src.rock;
       sha256 = "0k4g9ahql83l4r2bykfs6sacf9l1wdpisav2i0z55fyfcdv387za";
-   };
+  };
   disabled = ( luaOlder "5.1");
-  propagatedBuildInputs = [lua  ];
-  buildType="builtin";
+  propagatedBuildInputs = [ lua ];  
+  buildType = "builtin";
 
   meta = {
     homepage = "https://github.com/kikito/inspect.lua";
@@ -134,13 +134,13 @@ lgi = buildLuarocksPackage {
   pname = "lgi";
   version = "0.9.2-1";
 
-  src =  fetchurl {
+  src = fetchurl {
       url    = https://luarocks.org/lgi-0.9.2-1.src.rock;
       sha256 = "07ajc5pdavp785mdyy82n0w6d592n96g95cvq025d6i0bcm2cypa";
-   };
+  };
   disabled = ( luaOlder "5.1");
-  propagatedBuildInputs = [lua  ];
-  buildType="make";
+  propagatedBuildInputs = [ lua ];  
+  buildType = "make";
 
   meta = {
     homepage = "https://github.com/pavouk/lgi";
@@ -154,13 +154,13 @@ lpeg_patterns = buildLuarocksPackage {
   pname = "lpeg_patterns";
   version = "0.5-0";
 
-  src =  fetchurl {
+  src = fetchurl {
       url    = https://luarocks.org/lpeg_patterns-0.5-0.src.rock;
       sha256 = "0mlw4nayrsdxrh98i26avz5i4170a9brciybw88kks496ra36v8f";
-   };
-
-  propagatedBuildInputs = [lua lpeg  ];
-  buildType="builtin";
+  };
+  
+  propagatedBuildInputs = [ lua lpeg ];  
+  buildType = "builtin";
 
   meta = {
     homepage = "https://github.com/daurnimator/lpeg_patterns/archive/v0.5.zip";
@@ -174,13 +174,13 @@ lpty = buildLuarocksPackage {
   pname = "lpty";
   version = "1.2.2-1";
 
-  src =  fetchurl {
+  src = fetchurl {
       url    = https://luarocks.org/lpty-1.2.2-1.src.rock;
       sha256 = "1vxvsjgjfirl6ranz6k4q4y2dnxqh72bndbk400if22x8lqbkxzm";
-   };
+  };
   disabled = ( luaOlder "5.1");
-  propagatedBuildInputs = [lua  ];
-  buildType="make";
+  propagatedBuildInputs = [ lua ];  
+  buildType = "make";
 
   meta = {
     homepage = "http://www.tset.de/lpty/";
@@ -194,13 +194,13 @@ lrexlib-gnu = buildLuarocksPackage {
   pname = "lrexlib-gnu";
   version = "2.9.0-1";
 
-  src =  fetchurl {
+  src = fetchurl {
       url    = https://luarocks.org/lrexlib-gnu-2.9.0-1.src.rock;
       sha256 = "036rda4rji1pbnbxk1nzjy5zmigdsiacqbzrbvciwq3lrxa2j5s2";
-   };
+  };
   disabled = ( luaOlder "5.1");
-  propagatedBuildInputs = [lua  ];
-  buildType="builtin";
+  propagatedBuildInputs = [ lua ];  
+  buildType = "builtin";
 
   meta = {
     homepage = "https://github.com/rrthomas/lrexlib";
@@ -214,13 +214,13 @@ lrexlib-posix = buildLuarocksPackage {
   pname = "lrexlib-posix";
   version = "2.9.0-1";
 
-  src =  fetchurl {
+  src = fetchurl {
       url    = https://luarocks.org/lrexlib-posix-2.9.0-1.src.rock;
       sha256 = "0ifpybf4m94g1nk70l0f5m45gph0rbp5wrxrl1hnw8ibv3mc1b1r";
-   };
+  };
   disabled = ( luaOlder "5.1");
-  propagatedBuildInputs = [lua  ];
-  buildType="builtin";
+  propagatedBuildInputs = [ lua ];  
+  buildType = "builtin";
 
   meta = {
     homepage = "https://github.com/rrthomas/lrexlib";
@@ -234,13 +234,13 @@ ltermbox = buildLuarocksPackage {
   pname = "ltermbox";
   version = "0.2-1";
 
-  src =  fetchurl {
+  src = fetchurl {
       url    = https://luarocks.org/ltermbox-0.2-1.src.rock;
       sha256 = "08jqlmmskbi1ml1i34dlmg6hxcs60nlm32dahpxhcrgjnfihmyn8";
-   };
+  };
   disabled = ( luaOlder "5.1");
-  propagatedBuildInputs = [lua  ];
-  buildType="builtin";
+  propagatedBuildInputs = [ lua ];  
+  buildType = "builtin";
 
   meta = {
     homepage = "http://code.google.com/p/termbox";
@@ -254,12 +254,12 @@ lua-cmsgpack = buildLuarocksPackage {
   pname = "lua-cmsgpack";
   version = "0.4.0-0";
 
-  knownRockspec = ( fetchurl {
+         knownRockspec = (fetchurl {
       url    = https://luarocks.org/lua-cmsgpack-0.4.0-0.rockspec;
       sha256 = "10cvr6knx3qvjcw1q9v05f2qy607mai7lbq321nx682aa0n1fzin";
-   }).outPath;
+  }).outPath;
 
-   src =  fetchgit ( removeAttrs (builtins.fromJSON ''{
+       src = fetchgit ( removeAttrs (builtins.fromJSON ''{
   "url": "git://github.com/antirez/lua-cmsgpack.git",
   "rev": "57b1f90cf6cec46450e87289ed5a676165d31071",
   "date": "2018-06-14T11:56:56+02:00",
@@ -267,10 +267,10 @@ lua-cmsgpack = buildLuarocksPackage {
   "fetchSubmodules": true
 }
  '') ["date"]) ;
-
+       
   disabled = ( luaOlder "5.1");
-  propagatedBuildInputs = [lua  ];
-  buildType="builtin";
+  propagatedBuildInputs = [ lua ];  
+  buildType = "builtin";
 
   meta = {
     homepage = "https://github.com/antirez/lua-cmsgpack";
@@ -284,13 +284,13 @@ lua_cliargs = buildLuarocksPackage {
   pname = "lua_cliargs";
   version = "3.0-2";
 
-  src =  fetchurl {
+  src = fetchurl {
       url    = https://luarocks.org/lua_cliargs-3.0-2.src.rock;
       sha256 = "0qqdnw00r16xbyqn4w1xwwpg9i9ppc3c1dcypazjvdxaj899hy9w";
-   };
+  };
   disabled = ( luaOlder "5.1");
-  propagatedBuildInputs = [lua  ];
-  buildType="builtin";
+  propagatedBuildInputs = [ lua ];  
+  buildType = "builtin";
 
   meta = {
     homepage = "https://github.com/amireh/lua_cliargs";
@@ -304,13 +304,13 @@ lua-iconv = buildLuarocksPackage {
   pname = "lua-iconv";
   version = "7-3";
 
-  src =  fetchurl {
+  src = fetchurl {
       url    = https://luarocks.org/lua-iconv-7-3.src.rock;
       sha256 = "03xibhcqwihyjhxnzv367q4bfmzmffxl49lmjsq77g0prw8v0q83";
-   };
+  };
   disabled = ( luaOlder "5.1");
-  propagatedBuildInputs = [lua  ];
-  buildType="builtin";
+  propagatedBuildInputs = [ lua ];  
+  buildType = "builtin";
 
   meta = {
     homepage = "http://ittner.github.com/lua-iconv/";
@@ -320,23 +320,43 @@ lua-iconv = buildLuarocksPackage {
     };
   };
 };
+lua-messagepack = buildLuarocksPackage {
+  pname = "lua-messagepack";
+  version = "0.5.1-2";
+
+  src = fetchurl {
+      url    = https://luarocks.org/lua-messagepack-0.5.1-2.src.rock;
+      sha256 = "0bsdzdd24p9z3j4z1avw7qaqx87baa1pm58v275pw4h6n72z492g";
+  };
+  disabled = ( luaOlder "5.1");
+  propagatedBuildInputs = [ lua ];  
+  buildType = "builtin";
+
+  meta = {
+    homepage = "http://fperrad.frama.io/lua-MessagePack/";
+    description="a pure Lua implementation of the MessagePack serialization format";
+    license = {
+      fullName = "MIT/X11";
+    };
+  };
+};
 lua-term = buildLuarocksPackage {
   pname = "lua-term";
   version = "0.7-1";
 
-  knownRockspec = ( fetchurl {
+         knownRockspec = (fetchurl {
       url    = https://luarocks.org/lua-term-0.7-1.rockspec;
       sha256 = "0r9g5jw7pqr1dyj6w58dqlr7y7l0jp077n8nnji4phf10biyrvg2";
-   }).outPath;
+  }).outPath;
 
-   src =  fetchurl {
+       src = fetchurl {
       url    = https://github.com/hoelzro/lua-term/archive/0.07.tar.gz;
       sha256 = "0c3zc0cl3a5pbdn056vnlan16g0wimv0p9bq52h7w507f72x18f1";
-   };
-
-
-
-  buildType="builtin";
+  };
+       
+  
+    
+  buildType = "builtin";
 
   meta = {
     homepage = "https://github.com/hoelzro/lua-term";
@@ -346,21 +366,21 @@ lua-term = buildLuarocksPackage {
     };
   };
 };
-luaevent = buildLuarocksPackage {
-  pname = "luaevent";
-  version = "0.4.6-1";
+lua-toml = buildLuarocksPackage {
+  pname = "lua-toml";
+  version = "2.0-1";
 
-  src =  fetchurl {
-      url    = https://luarocks.org/luaevent-0.4.6-1.src.rock;
-      sha256 = "0chq09nawiz00lxd6pkdqcb8v426gdifjw6js3ql0lx5vqdkb6dz";
-   };
+  src = fetchurl {
+      url    = https://luarocks.org/lua-toml-2.0-1.src.rock;
+      sha256 = "0lyqlnydqbplq82brw9ipqy9gijin6hj1wc46plz994pg4i2c74m";
+  };
   disabled = ( luaOlder "5.1");
-  propagatedBuildInputs = [lua  ];
-  buildType="builtin";
+  propagatedBuildInputs = [ lua ];  
+  buildType = "builtin";
 
   meta = {
-    homepage = "https://github.com/harningt/luaevent";
-    description="libevent binding for Lua";
+    homepage = "https://github.com/jonstoler/lua-toml";
+    description="toml decoder/encoder for Lua";
     license = {
       fullName = "MIT";
     };
@@ -370,12 +390,12 @@ luabitop = buildLuarocksPackage {
   pname = "luabitop";
   version = "1.0.2-3";
 
-  knownRockspec = ( fetchurl {
+         knownRockspec = (fetchurl {
       url    = https://luarocks.org/luabitop-1.0.2-3.rockspec;
       sha256 = "07y2h11hbxmby7kyhy3mda64w83p4a6p7y7rzrjqgc0r56yjxhcc";
-   }).outPath;
+  }).outPath;
 
-   src =  fetchgit ( removeAttrs (builtins.fromJSON ''{
+       src = fetchgit ( removeAttrs (builtins.fromJSON ''{
   "url": "git://github.com/LuaDist/luabitop.git",
   "rev": "81bb23b0e737805442033535de8e6d204d0e5381",
   "date": "2013-02-18T16:36:42+01:00",
@@ -383,10 +403,10 @@ luabitop = buildLuarocksPackage {
   "fetchSubmodules": true
 }
  '') ["date"]) ;
-
+       
   disabled = ( luaOlder "5.1") || ( luaAtLeast "5.3");
-  propagatedBuildInputs = [lua  ];
-  buildType="builtin";
+  propagatedBuildInputs = [ lua ];  
+  buildType = "builtin";
 
   meta = {
     homepage = "http://bitop.luajit.org/";
@@ -396,17 +416,37 @@ luabitop = buildLuarocksPackage {
     };
   };
 };
+luaevent = buildLuarocksPackage {
+  pname = "luaevent";
+  version = "0.4.6-1";
+
+  src = fetchurl {
+      url    = https://luarocks.org/luaevent-0.4.6-1.src.rock;
+      sha256 = "0chq09nawiz00lxd6pkdqcb8v426gdifjw6js3ql0lx5vqdkb6dz";
+  };
+  disabled = ( luaOlder "5.1");
+  propagatedBuildInputs = [ lua ];  
+  buildType = "builtin";
+
+  meta = {
+    homepage = "https://github.com/harningt/luaevent";
+    description="libevent binding for Lua";
+    license = {
+      fullName = "MIT";
+    };
+  };
+};
 luacheck = buildLuarocksPackage {
   pname = "luacheck";
   version = "0.23.0-1";
 
-  src =  fetchurl {
+  src = fetchurl {
       url    = https://luarocks.org/luacheck-0.23.0-1.src.rock;
       sha256 = "0akj61c7k1na2mggsckvfn9a3ljfp4agnmr9gp3mac4vin99a1cl";
-   };
+  };
   disabled = ( luaOlder "5.1") || ( luaAtLeast "5.4");
-  propagatedBuildInputs = [lua argparse luafilesystem  ];
-  buildType="builtin";
+  propagatedBuildInputs = [ lua argparse luafilesystem ];  
+  buildType = "builtin";
 
   meta = {
     homepage = "https://github.com/mpeterv/luacheck";
@@ -420,13 +460,13 @@ luaffi = buildLuarocksPackage {
   pname = "luaffi";
   version = "scm-1";
 
-  src =  fetchurl {
+  src = fetchurl {
       url    = http://luarocks.org/dev/luaffi-scm-1.src.rock;
       sha256 = "0dia66w8sgzw26bwy36gzyb2hyv7kh9n95lh5dl0158rqa6fsf26";
-   };
+  };
   disabled = ( luaOlder "5.1");
-  propagatedBuildInputs = [lua  ];
-  buildType="builtin";
+  propagatedBuildInputs = [ lua ];  
+  buildType = "builtin";
 
   meta = {
     homepage = "https://github.com/facebook/luaffifb";
@@ -440,13 +480,13 @@ luuid = buildLuarocksPackage {
   pname = "luuid";
   version = "20120509-2";
 
-  src =  fetchurl {
+  src = fetchurl {
       url    = https://luarocks.org/luuid-20120509-2.src.rock;
       sha256 = "08q54x0m51w89np3n117h2a153wsgv3qayabd8cz6i55qm544hkg";
-   };
+  };
   disabled = ( luaOlder "5.2") || ( luaAtLeast "5.4");
-  propagatedBuildInputs = [lua  ];
-  buildType="builtin";
+  propagatedBuildInputs = [ lua ];  
+  buildType = "builtin";
 
   meta = {
     homepage = "http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/#luuid";
@@ -460,19 +500,19 @@ penlight = buildLuarocksPackage {
   pname = "penlight";
   version = "1.5.4-1";
 
-  knownRockspec = ( fetchurl {
+         knownRockspec = (fetchurl {
       url    = https://luarocks.org/penlight-1.5.4-1.rockspec;
       sha256 = "07mhsk9kmdxg4i2w4mrnnd2zs34bgggi9gigfplakxin96sa6c0p";
-   }).outPath;
+  }).outPath;
 
-   src =  fetchurl {
+       src = fetchurl {
       url    = http://stevedonovan.github.io/files/penlight-1.5.4.zip;
       sha256 = "138f921p6kdqkmf4pz115phhj0jsqf28g33avws80d2vq2ixqm8q";
-   };
-
-
-  propagatedBuildInputs = [luafilesystem  ];
-  buildType="builtin";
+  };
+       
+  
+  propagatedBuildInputs = [ luafilesystem ];  
+  buildType = "builtin";
 
   meta = {
     homepage = "http://stevedonovan.github.com/Penlight";
@@ -482,23 +522,43 @@ penlight = buildLuarocksPackage {
     };
   };
 };
+rapidjson = buildLuarocksPackage {
+  pname = "rapidjson";
+  version = "0.5.1-1";
+
+  src = fetchurl {
+      url    = https://luarocks.org/rapidjson-0.5.1-1.src.rock;
+      sha256 = "0hnqsixnbz95cvm9q5dn0lr0qjvhqw4llw6l1sjswwk0am4yybay";
+  };
+  disabled = ( luaOlder "5.1");
+  propagatedBuildInputs = [ lua ];  
+  buildType = "cmake";
+
+  meta = {
+    homepage = "https://github.com/xpol/lua-rapidjson";
+    description="Json module based on the very fast RapidJSON.";
+    license = {
+      fullName = "MIT";
+    };
+  };
+};
 say = buildLuarocksPackage {
   pname = "say";
   version = "1.3-1";
 
-  knownRockspec = ( fetchurl {
+         knownRockspec = (fetchurl {
       url    = https://luarocks.org/say-1.3-1.rockspec;
       sha256 = "0bknglb0qwd6r703wp3hcb6z2xxd14kq4md3sg9al3b28fzxbhdv";
-   }).outPath;
+  }).outPath;
 
-   src =  fetchurl {
+       src = fetchurl {
       url    = https://github.com/Olivine-Labs/say/archive/v1.3-1.tar.gz;
       sha256 = "1jh76mxq9dcmv7kps2spwcc6895jmj2sf04i4y9idaxlicvwvs13";
-   };
-
+  };
+       
   disabled = ( luaOlder "5.1");
-  propagatedBuildInputs = [lua  ];
-  buildType="builtin";
+  propagatedBuildInputs = [ lua ];  
+  buildType = "builtin";
 
   meta = {
     homepage = "http://olivinelabs.com/busted/";
@@ -508,23 +568,57 @@ say = buildLuarocksPackage {
     };
   };
 };
-luv = buildLuarocksPackage {
-  pname = "luv";
-  version = "1.22.0-1";
+std__debug = buildLuarocksPackage {
+  pname = "std._debug";
+  version = "1.0.1-1";
 
-  knownRockspec = ( fetchurl {
-      url    = https://luarocks.org/luv-1.22.0-1.rockspec;
-      sha256 = "0yxjy9wj4aqbv1my8fkciy2xar5si6bcsszipgyls24rl6lnmga3";
-   }).outPath;
+  src = fetchurl {
+      url    = https://luarocks.org/std._debug-1.0.1-1.src.rock;
+      sha256 = "1qkcc5rph3ns9mzrfsa1671pb3hzbzfnaxvyw7zdly2b7ll88svz";
+  };
+  disabled = ( luaOlder "5.1") || ( luaAtLeast "5.5");
+  propagatedBuildInputs = [ lua ];  
+  buildType = "builtin";
 
-   src =  fetchurl {
-      url    = https://github.com/luvit/luv/releases/download/1.22.0-1/luv-1.22.0-1.tar.gz;
-      sha256 = "1xvz4a0r6kd1xqxwm55g9n6imprxb79600x7dhyillrz7p5nm217";
-   };
+  meta = {
+    homepage = "http://lua-stdlib.github.io/_debug";
+    description="Debug Hints Library";
+    license = {
+      fullName = "MIT/X11";
+    };
+  };
+};
+std_normalize = buildLuarocksPackage {
+  pname = "std.normalize";
+  version = "2.0.2-1";
+
+  src = fetchurl {
+      url    = https://luarocks.org/std.normalize-2.0.2-1.src.rock;
+      sha256 = "0yn60zqnxflhhlv6xk6w0ifdfxk1qcg8gq1wnrrbwsxwpipsrfjh";
+  };
+  disabled = ( luaOlder "5.1") || ( luaAtLeast "5.4");
+  propagatedBuildInputs = [ lua std__debug ];  
+  buildType = "builtin";
+
+  meta = {
+    homepage = "https://lua-stdlib.github.io/normalize";
+    description="Normalized Lua Functions";
+    license = {
+      fullName = "MIT/X11";
+    };
+  };
+};
+luv = buildLuarocksPackage {
+  pname = "luv";
+  version = "1.26.0-0";
 
+  src = fetchurl {
+      url    = https://luarocks.org/luv-1.26.0-0.src.rock;
+      sha256 = "005yzcxlribnc45qr1g7q4psakximb9fbz07k6yzy1d94mhcxxr7";
+  };
   disabled = ( luaOlder "5.1");
-  propagatedBuildInputs = [lua  ];
-  buildType="cmake";
+  propagatedBuildInputs = [ lua ];  
+  buildType = "cmake";
 
   meta = {
     homepage = "https://github.com/luvit/luv";
@@ -538,13 +632,13 @@ luasystem = buildLuarocksPackage {
   pname = "luasystem";
   version = "0.2.1-0";
 
-  src =  fetchurl {
+  src = fetchurl {
       url    = https://luarocks.org/luasystem-0.2.1-0.src.rock;
       sha256 = "091xmp8cijgj0yzfsjrn7vljwznjnjn278ay7z9pjwpwiva0diyi";
-   };
+  };
   disabled = ( luaOlder "5.1");
-  propagatedBuildInputs = [lua  ];
-  buildType="builtin";
+  propagatedBuildInputs = [ lua ];  
+  buildType = "builtin";
 
   meta = {
     homepage = "http://olivinelabs.com/luasystem/";
@@ -558,13 +652,13 @@ mediator_lua = buildLuarocksPackage {
   pname = "mediator_lua";
   version = "1.1.2-0";
 
-  src =  fetchurl {
+  src = fetchurl {
       url    = http://luarocks.org/manifests/teto/mediator_lua-1.1.2-0.src.rock;
       sha256 = "18j49vvs94yfk4fw0xsq4v3j4difr6c99gfba0kxairmcqamd1if";
-   };
+  };
   disabled = ( luaOlder "5.1");
-  propagatedBuildInputs = [lua  ];
-  buildType="builtin";
+  propagatedBuildInputs = [ lua ];  
+  buildType = "builtin";
 
   meta = {
     homepage = "http://olivinelabs.com/mediator_lua/";
@@ -578,13 +672,13 @@ mpack = buildLuarocksPackage {
   pname = "mpack";
   version = "1.0.7-0";
 
-  src =  fetchurl {
+  src = fetchurl {
       url    = http://luarocks.org/manifests/teto/mpack-1.0.7-0.src.rock;
       sha256 = "0nq4ixaminkc7fwfpivysyv0al3j5dffsvgdrnwnqdg3w7jgfbw7";
-   };
-
-
-  buildType="builtin";
+  };
+  
+    
+  buildType = "builtin";
 
   meta = {
     homepage = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.7/libmpack-lua-1.0.7.tar.gz";
@@ -598,13 +692,13 @@ nvim-client = buildLuarocksPackage {
   pname = "nvim-client";
   version = "0.1.0-1";
 
-  src =  fetchurl {
+  src = fetchurl {
       url    = https://luarocks.org/nvim-client-0.1.0-1.src.rock;
       sha256 = "1p57mrvm0ny3yi5cydr3z9qwzyg124rjp5w7vdflf2i23z39mkma";
-   };
+  };
   disabled = ( luaOlder "5.1");
-  propagatedBuildInputs = [lua mpack luv coxpcall  ];
-  buildType="builtin";
+  propagatedBuildInputs = [ lua mpack luv coxpcall ];  
+  buildType = "builtin";
 
   meta = {
     homepage = "https://github.com/neovim/lua-client/archive/0.1.0-1.tar.gz";
@@ -618,19 +712,19 @@ busted = buildLuarocksPackage {
   pname = "busted";
   version = "2.0.rc13-0";
 
-  knownRockspec = ( fetchurl {
+         knownRockspec = (fetchurl {
       url    = https://luarocks.org/busted-2.0.rc13-0.rockspec;
       sha256 = "0hrvhg1324q5ra6cpjh1y3by6lrzs0ljah4jl48l8xlgw1z9z1q5";
-   }).outPath;
+  }).outPath;
 
-   src =  fetchurl {
+       src = fetchurl {
       url    = https://github.com/Olivine-Labs/busted/archive/v2.0.rc13-0.tar.gz;
       sha256 = "0m72bldn1r6j94ahcfmpaq1mmysrshf9qi9fjas7hpal0jp8ivvl";
-   };
-
+  };
+       
   disabled = ( luaOlder "5.1");
-  propagatedBuildInputs = [lua lua_cliargs luafilesystem luasystem dkjson say luassert lua-term penlight mediator_lua  ];
-  buildType="builtin";
+  propagatedBuildInputs = [ lua lua_cliargs luafilesystem luasystem dkjson say luassert lua-term penlight mediator_lua ];  
+  buildType = "builtin";
 
   meta = {
     homepage = "http://olivinelabs.com/busted/";
@@ -644,19 +738,19 @@ luassert = buildLuarocksPackage {
   pname = "luassert";
   version = "1.7.11-0";
 
-  knownRockspec = ( fetchurl {
+         knownRockspec = (fetchurl {
       url    = https://luarocks.org/luassert-1.7.11-0.rockspec;
       sha256 = "12zgybcv8acjzvjdbxd1764s1vxbksxdv9fkvsymcsdmppxkbd0s";
-   }).outPath;
+  }).outPath;
 
-   src =  fetchurl {
+       src = fetchurl {
       url    = https://github.com/Olivine-Labs/luassert/archive/v1.7.11.tar.gz;
       sha256 = "1vwq3wqj9cjyz9lnf1n38yhpcglr2h40v3n9096i8vcpmyvdb3ka";
-   };
-
+  };
+       
   disabled = ( luaOlder "5.1");
-  propagatedBuildInputs = [lua say  ];
-  buildType="builtin";
+  propagatedBuildInputs = [ lua say ];  
+  buildType = "builtin";
 
   meta = {
     homepage = "http://olivinelabs.com/busted/";
@@ -670,13 +764,13 @@ coxpcall = buildLuarocksPackage {
   pname = "coxpcall";
   version = "1.17.0-1";
 
-  src =  fetchurl {
+  src = fetchurl {
       url    = https://luarocks.org/manifests/hisham/coxpcall-1.17.0-1.src.rock;
       sha256 = "0n1jmda4g7x06458596bamhzhcsly6x0p31yp6q3jz4j11zv1zhi";
-   };
-
-
-  buildType="builtin";
+  };
+  
+    
+  buildType = "builtin";
 
   meta = {
     homepage = "http://keplerproject.github.io/coxpcall";
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index a0ea365c7a56..0cf0c70faa10 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -68,4 +68,11 @@ with super;
       platforms = pkgs.lib.platforms.linux;
     };
   });
+
+  rapidjson = super.rapidjson.overrideAttrs(oa: {
+    preBuild = ''
+      sed -i '/set(CMAKE_CXX_FLAGS/d' CMakeLists.txt
+      sed -i '/set(CMAKE_C_FLAGS/d' CMakeLists.txt
+    '';
+  });
  }
diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix
index ec63e58fbb65..d35a57f6b4bc 100644
--- a/pkgs/development/ocaml-modules/eliom/default.nix
+++ b/pkgs/development/ocaml-modules/eliom/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml, lwt_camlp4,
+{ stdenv, fetchzip, which, ocsigen_server, ocsigen_deriving, ocaml, lwt_camlp4,
   lwt_react, cryptokit,
   ipaddr, ocamlnet, ocaml_pcre,
   opaline, ppx_tools, ppx_deriving, findlib
@@ -11,12 +11,12 @@
 stdenv.mkDerivation rec
 {
   pname = "eliom";
-  version = "6.4.0";
+  version = "6.7.0";
   name = "${pname}-${version}";
 
-  src = fetchurl {
+  src = fetchzip {
     url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz";
-    sha256 = "1ad7ympvj0cb51d9kbp4naxkld3gv8cfp4a037a5dr55761zdhdh";
+    sha256 = "0mrlpvjaihpsf2xr6p1gs0sz4cwzkknf5b1s32bhmqq5qzsh4j8k";
   };
 
   patches = [ ./camlp4.patch ];
diff --git a/pkgs/development/ocaml-modules/ojquery/default.nix b/pkgs/development/ocaml-modules/ojquery/default.nix
deleted file mode 100644
index 6b0eefe195f1..000000000000
--- a/pkgs/development/ocaml-modules/ojquery/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchgit, ocaml, findlib, ocamlbuild, js_of_ocaml, js_of_ocaml-camlp4, camlp4, ocaml_lwt, react }:
-
-if stdenv.lib.versionAtLeast ocaml.version "4.06"
-then throw "ojquery is not available for OCaml ${ocaml.version}"
-else
-
-stdenv.mkDerivation rec {
-  version = "0.1";
-  name = "ocaml-ojquery-${version}";
-  src = fetchgit {
-    url = https://github.com/ocsigen/ojquery.git;
-    rev = "refs/tags/${version}";
-    sha256 = "1n01bsk4car40p94fk1ssvww0inqapwwhdylmrb7vv40drsdldp1";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild js_of_ocaml-camlp4 camlp4 ];
-  propagatedBuildInputs = [ js_of_ocaml ocaml_lwt react ];
-
-  createFindlibDestdir = true;
-
-  meta = {
-    description = "jQuery Binding for Eliom";
-    homepage = http://ocsigen.org/ojquery/;
-    license = stdenv.lib.licenses.lgpl3;
-    platforms = ocaml.meta.platforms or [];
-    maintainers = with stdenv.lib.maintainers; [ vbgl ];
-  };
-}
diff --git a/pkgs/development/ocaml-modules/tyxml/default.nix b/pkgs/development/ocaml-modules/tyxml/default.nix
index 0a8947f3324a..94bcdb45f328 100644
--- a/pkgs/development/ocaml-modules/tyxml/default.nix
+++ b/pkgs/development/ocaml-modules/tyxml/default.nix
@@ -1,34 +1,20 @@
-{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, uutf, markup, ppx_tools_versioned, re
-, withP4 ? true
-, camlp4 ? null
-}:
+{ lib, buildDunePackage, fetchurl, re, uutf }:
 
-assert stdenv.lib.versionAtLeast ocaml.version "4.02";
-
-stdenv.mkDerivation rec {
+buildDunePackage rec {
   pname = "tyxml";
-  version = "4.2.0";
-  name = "ocaml${ocaml.version}-${pname}-${version}";
+  version = "4.3.0";
 
-  src = fetchzip {
-    url = "https://github.com/ocsigen/tyxml/archive/${version}.tar.gz";
-    sha256 = "1zrkrmxyj5a2cdh4b9zr9anwfk320wv3x0ynxnyxl5za2ix8sld8";
+  src = fetchurl {
+    url = "https://github.com/ocsigen/tyxml/releases/download/${version}/tyxml-${version}.tbz";
+    sha256 = "1hxzppfvsdls2y8qiwvz31hmffzh2hgglf01am1vzf2f31mxf6vf";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild ppx_tools_versioned markup ]
-  ++ stdenv.lib.optional withP4 camlp4;
-
   propagatedBuildInputs = [ uutf re ];
 
-  createFindlibDestdir = true;
-
-  configureFlags = stdenv.lib.optional withP4 "--enable-syntax";
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = http://ocsigen.org/tyxml/;
     description = "A library that makes it almost impossible for your OCaml programs to generate wrong XML output, using static typing";
     license = licenses.lgpl21;
-    platforms = ocaml.meta.platforms or [];
     maintainers = with maintainers; [
       gal_bolle vbgl
       ];
diff --git a/pkgs/development/python-modules/box2d/default.nix b/pkgs/development/python-modules/box2d/default.nix
index f1bd87126795..5870bdcdb732 100644
--- a/pkgs/development/python-modules/box2d/default.nix
+++ b/pkgs/development/python-modules/box2d/default.nix
@@ -2,7 +2,6 @@
 , buildPythonPackage
 , fetchPypi
 , swig2
-, pkgs-box2d
 , isPy3k
 }:
 
@@ -20,7 +19,7 @@ buildPythonPackage rec {
     sed -i "s/'Box2D.tests' : 'tests'//" setup.py
   '';
 
-  buildInputs = [ swig2 pkgs-box2d ];
+  nativeBuildInputs = [ swig2 ];
 
   # tests not included with pypi release
   doCheck = false;
diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix
index f7b09b96fb16..453a046c54f2 100644
--- a/pkgs/development/python-modules/breathe/default.nix
+++ b/pkgs/development/python-modules/breathe/default.nix
@@ -1,12 +1,12 @@
 { lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k }:
 
 buildPythonPackage rec {
-  version = "4.11.1";
+  version = "4.12.0";
   pname = "breathe";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1mps0cfli6iq2gqsv3d24fs1cp7sq7crd9ji6lw63b9r40998ylv";
+    sha256 = "1wmxppzyvfd5gab72qi3gainibrdk4xi8nsfp5z5h49xgzi84mnq";
   };
 
   propagatedBuildInputs = [ docutils six sphinx ];
diff --git a/pkgs/development/python-modules/caldav/default.nix b/pkgs/development/python-modules/caldav/default.nix
new file mode 100644
index 000000000000..027bc1784d1c
--- /dev/null
+++ b/pkgs/development/python-modules/caldav/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildPythonPackage, fetchPypi
+, tzlocal, requests, vobject, lxml }:
+
+buildPythonPackage rec {
+  pname = "caldav";
+  version = "0.6.0";
+
+  propagatedBuildInputs = [ tzlocal requests vobject lxml ];
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1ll9knpc50yxx858hrvfnapdi2a6g1pz9cnjhwffry2x7r4ckarz";
+  };
+
+  meta = with lib; {
+    description = "This project is a CalDAV (RFC4791) client library for Python.";
+    homepage = "https://pythonhosted.org/caldav/";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ marenz ];
+  };
+}
diff --git a/pkgs/development/python-modules/cli-helpers/default.nix b/pkgs/development/python-modules/cli-helpers/default.nix
index f2817d0fd325..f929180406b3 100644
--- a/pkgs/development/python-modules/cli-helpers/default.nix
+++ b/pkgs/development/python-modules/cli-helpers/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname = "cli_helpers";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7c2038bba0c41f41acae0f6e660ff3b00d69f55d9d968f024952cace78111e12";
+    sha256 = "0p9yklddpplncr765h6qrii1dgvvlqxj25n5400dwqas9lmij4fj";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/django-picklefield/default.nix b/pkgs/development/python-modules/django-picklefield/default.nix
index 683c0bc0cebc..4bcd767bd63d 100644
--- a/pkgs/development/python-modules/django-picklefield/default.nix
+++ b/pkgs/development/python-modules/django-picklefield/default.nix
@@ -1,17 +1,19 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi, django }:
 
 buildPythonPackage rec {
   pname = "django-picklefield";
   version = "2.0";
 
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "f1733a8db1b6046c0d7d738e785f9875aa3c198215de11993463a9339aa4ea24";
+  };
+
+  propagatedBuildInputs = [ django ];
+
   meta = {
     description = "A pickled object field for Django";
     homepage = https://github.com/gintas/django-picklefield;
     license = lib.licenses.mit;
   };
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "f1733a8db1b6046c0d7d738e785f9875aa3c198215de11993463a9339aa4ea24";
-  };
 }
diff --git a/pkgs/development/python-modules/ezdxf/default.nix b/pkgs/development/python-modules/ezdxf/default.nix
index 317c16d52754..94fca96b455b 100644
--- a/pkgs/development/python-modules/ezdxf/default.nix
+++ b/pkgs/development/python-modules/ezdxf/default.nix
@@ -1,18 +1,20 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, pyparsing, pytest }:
+{ stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, pyparsing, pytest }:
 
 buildPythonPackage rec {
-  version = "0.8.8";
+  version = "0.9";
   pname = "ezdxf";
 
+  disabled = pythonOlder "3.5";
+
   src = fetchFromGitHub {
     owner = "mozman";
     repo = "ezdxf";
     rev = "v${version}";
-    sha256 = "0ap6f6vy71s3y0a048r5ca98i7p8nc9l0mx3mngvvpvjij7j3fcf";
+    sha256 = "1ggimjd9060b696sgzgxy9j9sl45wh9qbxnf0035qclafshprlzl";
   };
 
-  buildInputs = [ pytest ];
-  checkPhase = "python -m unittest discover -s tests";
+  checkInputs = [ pytest ];
+  checkPhase = "pytest tests integration_tests";
 
   propagatedBuildInputs = [ pyparsing ];
 
diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix
index d8e04f56146e..eccbd9c0d159 100644
--- a/pkgs/development/python-modules/pg8000/default.nix
+++ b/pkgs/development/python-modules/pg8000/default.nix
@@ -1,20 +1,22 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
-, pytz
-, six
+, isPy3k
+, passlib
 }:
 
 buildPythonPackage rec {
   pname = "pg8000";
   version = "1.13.1";
 
+  disabled = !isPy3k;
+
   src = fetchPypi {
     inherit pname version;
     sha256 = "2208c7aaffe8d61f5c4ccbefeb74ba033003899e64aee37c0eb98aadae8b9c6b";
   };
 
-  propagatedBuildInputs = [ pytz six ];
+  propagatedBuildInputs = [ passlib ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/tlocke/pg8000;
diff --git a/pkgs/development/python-modules/pyhamcrest/default.nix b/pkgs/development/python-modules/pyhamcrest/default.nix
index f452d0599362..18540aca50eb 100644
--- a/pkgs/development/python-modules/pyhamcrest/default.nix
+++ b/pkgs/development/python-modules/pyhamcrest/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, buildPythonApplication, fetchPypi
+{ stdenv, buildPythonPackage, fetchPypi
 , mock, pytest
 , six
 }:
-buildPythonApplication rec {
+buildPythonPackage rec {
   pname = "PyHamcrest";
   version = "1.9.0";
 
diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix
index 48dbc9b710a7..47e269c2ff50 100644
--- a/pkgs/development/python-modules/python-efl/default.nix
+++ b/pkgs/development/python-modules/python-efl/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   name = "python-efl-${version}";
-  version = "1.21.0";
+  version = "1.22.0";
 
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.xz";
-    sha256 = "08x2cv8hnf004c3711250wrax21ffj5y8951pvk77h98als4pq47";
+    sha256 = "1qhy63c3fs2bxkx2np5z14hyxbr12ii030crsjnhpbyw3mic0s63";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix
index 7c45659220cb..f14200b3542b 100644
--- a/pkgs/development/python-modules/pytorch/default.nix
+++ b/pkgs/development/python-modules/pytorch/default.nix
@@ -81,11 +81,11 @@ in buildPythonPackage rec {
      cmake
      utillinux
      which
-  ];
+  ] ++ lib.optionals cudaSupport [ cudatoolkit_joined ];
 
   buildInputs = [
      numpy.blas
-  ] ++ lib.optionals cudaSupport [ cudatoolkit_joined cudnn ]
+  ] ++ lib.optionals cudaSupport [ cudnn ]
     ++ lib.optionals stdenv.isLinux [ numactl ];
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/ruby-modules/solargraph/Gemfile.lock b/pkgs/development/ruby-modules/solargraph/Gemfile.lock
index a936dd25d925..121c01f72af5 100644
--- a/pkgs/development/ruby-modules/solargraph/Gemfile.lock
+++ b/pkgs/development/ruby-modules/solargraph/Gemfile.lock
@@ -2,32 +2,32 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.0)
-    eventmachine (1.2.7)
+    backport (1.0.0)
     htmlentities (4.3.4)
-    jaro_winkler (1.5.1)
+    jaro_winkler (1.5.2)
     kramdown (1.17.0)
-    mini_portile2 (2.3.0)
-    nokogiri (1.8.5)
-      mini_portile2 (~> 2.3.0)
-    parallel (1.12.1)
-    parser (2.5.3.0)
+    mini_portile2 (2.4.0)
+    nokogiri (1.10.3)
+      mini_portile2 (~> 2.4.0)
+    parallel (1.17.0)
+    parser (2.6.3.0)
       ast (~> 2.4.0)
-    powerpack (0.1.2)
     rainbow (3.0.0)
     reverse_markdown (1.1.0)
       nokogiri
-    rubocop (0.60.0)
+    rubocop (0.68.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
-      powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.4.0)
+      unicode-display_width (>= 1.4.0, < 1.6)
     ruby-progressbar (1.10.0)
-    solargraph (0.29.1)
-      eventmachine (~> 1.2, >= 1.2.5)
+    solargraph (0.32.1)
+      backport (~> 1.0)
+      bundler (>= 1.17.2)
       htmlentities (~> 4.3, >= 4.3.4)
+      jaro_winkler (~> 1.5)
       kramdown (~> 1.16)
       parser (~> 2.3)
       reverse_markdown (~> 1.0, >= 1.0.5)
@@ -37,8 +37,8 @@ GEM
       yard (~> 0.9)
     thor (0.20.3)
     tilt (2.0.9)
-    unicode-display_width (1.4.0)
-    yard (0.9.16)
+    unicode-display_width (1.5.0)
+    yard (0.9.19)
 
 PLATFORMS
   ruby
@@ -47,4 +47,4 @@ DEPENDENCIES
   solargraph!
 
 BUNDLED WITH
-   1.17.1
+   1.17.2
diff --git a/pkgs/development/ruby-modules/solargraph/gemset.nix b/pkgs/development/ruby-modules/solargraph/gemset.nix
index bfb5496444af..75bb266246ac 100644
--- a/pkgs/development/ruby-modules/solargraph/gemset.nix
+++ b/pkgs/development/ruby-modules/solargraph/gemset.nix
@@ -1,5 +1,7 @@
 {
   ast = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7";
@@ -7,15 +9,19 @@
     };
     version = "2.4.0";
   };
-  eventmachine = {
+  backport = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r";
+      sha256 = "00kwxnj4jwjkf5ji473qsz0nq4kjsx6p6hzlm8iwbbylv22hf2xy";
       type = "gem";
     };
-    version = "1.2.7";
+    version = "1.0.0";
   };
   htmlentities = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj";
@@ -24,14 +30,18 @@
     version = "4.3.4";
   };
   jaro_winkler = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0rr797nqz081bfk30m2apj5h24bg5d1jr1c8p3xwx4hbwsrbclah";
+      sha256 = "1zz27z88qznix4r65gd9h56gl177snlfpgv10b0s69vi8qpl909l";
       type = "gem";
     };
-    version = "1.5.1";
+    version = "1.5.2";
   };
   kramdown = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq";
@@ -40,48 +50,50 @@
     version = "1.17.0";
   };
   mini_portile2 = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
+      sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
       type = "gem";
     };
-    version = "2.3.0";
+    version = "2.4.0";
   };
   nokogiri = {
     dependencies = ["mini_portile2"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz";
+      sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4";
       type = "gem";
     };
-    version = "1.8.5";
+    version = "1.10.3";
   };
   parallel = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "01hj8v1qnyl5ndrs33g8ld8ibk0rbcqdpkpznr04gkbxd11pqn67";
+      sha256 = "1x1gzgjrdlkm1aw0hfpyphsxcx90qgs3y4gmp9km3dvf4hc4qm8r";
       type = "gem";
     };
-    version = "1.12.1";
+    version = "1.17.0";
   };
   parser = {
     dependencies = ["ast"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1zjk0w1kjj3xk8ymy1430aa4gg0k8ckphfj88br6il4pm83f0n1f";
-      type = "gem";
-    };
-    version = "2.5.3.0";
-  };
-  powerpack = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1r51d67wd467rpdfl6x43y84vwm8f5ql9l9m85ak1s2sp3nc5hyv";
+      sha256 = "1pnks149x0fzgqiw53qlmvcd8bi746cxdw03sjljby5s97p1fskn";
       type = "gem";
     };
-    version = "0.1.2";
+    version = "2.6.3.0";
   };
   rainbow = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk";
@@ -91,6 +103,8 @@
   };
   reverse_markdown = {
     dependencies = ["nokogiri"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0w7y5n74daajvl9gixr91nh8670d7mkgspkk3ql71m8azq3nffbg";
@@ -99,15 +113,19 @@
     version = "1.1.0";
   };
   rubocop = {
-    dependencies = ["jaro_winkler" "parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
+    dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "ruby-progressbar" "unicode-display_width"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1ivk049z3mp12nc6v1wn35bsq1g7nz1i2r4xwzqf0v25hm2v7n1i";
+      sha256 = "171bczfafdmyz1lj6mgz2wdzz8i42w10zw2wj5j13y2f6hp687ca";
       type = "gem";
     };
-    version = "0.60.0";
+    version = "0.68.0";
   };
   ruby-progressbar = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1cv2ym3rl09svw8940ny67bav7b2db4ms39i4raaqzkf59jmhglk";
@@ -116,15 +134,19 @@
     version = "1.10.0";
   };
   solargraph = {
-    dependencies = ["eventmachine" "htmlentities" "kramdown" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"];
+    dependencies = ["backport" "htmlentities" "jaro_winkler" "kramdown" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "12sy1rdz2fk3aba43701qp1250xm8w26rlizypd6h5rnmmqm5q54";
+      sha256 = "1bsv0x9hhxwki7v8x99wzxcl1spgwrsxqd6alpb2y0wf9lsakabl";
       type = "gem";
     };
-    version = "0.29.1";
+    version = "0.32.1";
   };
   thor = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29";
@@ -133,6 +155,8 @@
     version = "0.20.3";
   };
   tilt = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz";
@@ -141,19 +165,23 @@
     version = "2.0.9";
   };
   unicode-display_width = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0040bsdpcmvp8w31lqi2s9s4p4h031zv52401qidmh25cgyh4a57";
+      sha256 = "1ssnc6rja9ii97z7m35y4zd0rd7cpv3bija20l7cpd7y4jyyx44q";
       type = "gem";
     };
-    version = "1.4.0";
+    version = "1.5.0";
   };
   yard = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0lmmr1839qgbb3zxfa7jf5mzy17yjl1yirwlgzdhws4452gqhn67";
+      sha256 = "1w0i13a0vsw4jmlj59xn64rdsqcsl9r3rmjjgdca5i51m1q4ix6v";
       type = "gem";
     };
-    version = "0.9.16";
+    version = "0.9.19";
   };
 }
\ No newline at end of file
diff --git a/pkgs/development/tools/analysis/autoflake/default.nix b/pkgs/development/tools/analysis/autoflake/default.nix
index c30c3555100a..a8b8a965256f 100644
--- a/pkgs/development/tools/analysis/autoflake/default.nix
+++ b/pkgs/development/tools/analysis/autoflake/default.nix
@@ -3,12 +3,12 @@
 with python3Packages;
 buildPythonApplication rec {
   pname = "autoflake";
-  version = "1.2";
+  version = "1.3";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c103e63466f11db3617167a2c68ff6a0cda35b940222920631c6eeec6b67e807";
+    sha256 = "0wzrvrn6279fijg8jkqbs6313f7b5ll5d22pk5s0fc1fp2wyanbb";
   };
 
   propagatedBuildInputs = [ pyflakes ];
diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index 5e3b001b6a08..8ab655bc4bd3 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "flow";
-  version = "0.97.0";
+  version = "0.98.0";
 
   src = fetchFromGitHub {
     owner  = "facebook";
     repo   = "flow";
     rev    = "refs/tags/v${version}";
-    sha256 = "1y6mdm7ph9k3vv8n8hzxr3rqa6bfkh4yn9bcxb7qq67v08dlvx6r";
+    sha256 = "13ry3bmgm3xy24kasx843dwd1nsv7nyd174696iaz2c64z46bbfm";
   };
 
   installPhase = ''
diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix
index 86748b716e6e..3b4869636399 100644
--- a/pkgs/development/tools/bazelisk/default.nix
+++ b/pkgs/development/tools/bazelisk/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "bazelisk";
-  version = "0.0.3";
+  version = "0.0.4";
 
   src = fetchFromGitHub {
     owner = "philwo";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1rkpw9izpav3ysb9fpbdf0m1wqrs3vl87s9zjjmfsjm5dfhxss72";
+    sha256 = "1hi4jmkqy1fjn91q72qlfvm63plz5jqb4hw4c1qv9ddqjgwrmxr3";
   };
 
   modSha256 = "1f73j6ryidzi3kfy3rhsqx047vzwvzaqcsl7ykhg87rn2l2s7fdl";
diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix
index bd9dbbb71742..07763e3fa68c 100644
--- a/pkgs/development/tools/coursier/default.nix
+++ b/pkgs/development/tools/coursier/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "coursier-${version}";
-  version = "1.1.0-M10";
+  version = "1.1.0-M14-1";
 
   src = fetchurl {
-    url = "https://github.com/coursier/coursier/raw/v${version}/coursier";
-    sha256 = "14iq0717vdm0mj0196idc724vmxp1y0f3gfn41sbqahfhvcx05y8";
+    url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier";
+    sha256 = "0km9bxhch2bh7v6yi5jzyvq95fwdmccwqmbiznzhz4iqij8y066w";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/dep/default.nix b/pkgs/development/tools/dep/default.nix
index 283193a485cd..a486d786c374 100644
--- a/pkgs/development/tools/dep/default.nix
+++ b/pkgs/development/tools/dep/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "dep-${version}";
-  version = "0.5.0";
+  version = "0.5.1";
   rev = "v${version}";
 
   goPackagePath = "github.com/golang/dep";
@@ -12,7 +12,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "golang";
     repo = "dep";
-    sha256 = "1p35995w2f8rp4cxhcwnhdv26ajx6gxx9pm2ijb5sjy2pwhw5c6j";
+    sha256 = "1a5vq5v3ikg6iysbywxr5hcjnbv76nzhk50rd3iq3v2fnyq38dv2";
   };
 
   buildFlagsArray = ("-ldflags=-s -w -X main.commitHash=${rev} -X main.version=${version}");
diff --git a/pkgs/development/tools/electron/5.x.nix b/pkgs/development/tools/electron/5.x.nix
new file mode 100644
index 000000000000..ba97587c5af7
--- /dev/null
+++ b/pkgs/development/tools/electron/5.x.nix
@@ -0,0 +1,77 @@
+{ stdenv, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, libuuid, at-spi2-atk, at-spi2-core }:
+
+let
+  version = "5.0.0";
+  name = "electron-${version}";
+
+  throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
+
+  meta = with stdenv.lib; {
+    description = "Cross platform desktop application shell";
+    homepage = https://github.com/electron/electron;
+    license = licenses.mit;
+    maintainers = with maintainers; [ travisbhartwell manveru ];
+    platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" "aarch64-linux" ];
+  };
+
+  linux = {
+    inherit name version meta;
+    src = {
+      i686-linux = fetchurl {
+        url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-ia32.zip";
+        sha256 = "01320qv0x18rmjn6ibbs49pd04d58rz5dac509lxxay8nfb14gdp";
+      };
+      x86_64-linux = fetchurl {
+        url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip";
+        sha256 = "0mkc8r5xggkzdypyq4hxigmjl6d1jn0139l8nwj1vr224ggnskhn";
+      };
+      armv7l-linux = fetchurl {
+        url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip";
+        sha256 = "1w767yxm3b6sj52z0wnzr4vfn0m8n2jdjhj3ksmq6qrv401vvib3";
+      };
+      aarch64-linux = fetchurl {
+        url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-arm64.zip";
+        sha256 = "1nvpfkrizkmr6xxb2ls19p9mhgpms65ws09bx3l8sqq6275916jk";
+      };
+    }.${stdenv.hostPlatform.system} or throwSystem;
+
+    buildInputs = [ unzip makeWrapper ];
+
+    buildCommand = ''
+      mkdir -p $out/lib/electron $out/bin
+      unzip -d $out/lib/electron $src
+      ln -s $out/lib/electron/electron $out/bin
+
+      fixupPhase
+
+      patchelf \
+        --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+        --set-rpath "${atomEnv.libPath}:${stdenv.lib.makeLibraryPath [ libuuid at-spi2-atk at-spi2-core ]}:$out/lib/electron" \
+        $out/lib/electron/electron
+
+      wrapProgram $out/lib/electron/electron \
+        --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1
+    '';
+  };
+
+  darwin = {
+    inherit name version meta;
+
+    src = fetchurl {
+      url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip";
+      sha256 = "07s2cq4ffpx86pjxrh1hcvk3r85saxqi3kkbbfkg9r1bbq8zbapm";
+    };
+
+    buildInputs = [ unzip ];
+
+    buildCommand = ''
+      mkdir -p $out/Applications
+      unzip $src
+      mv Electron.app $out/Applications
+      mkdir -p $out/bin
+      ln -s $out/Applications/Electron.app/Contents/MacOs/Electron $out/bin/electron
+    '';
+  };
+in
+
+  stdenv.mkDerivation (if stdenv.isDarwin then darwin else linux)
diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix
index d4fa99c48258..5f8aaf07d730 100644
--- a/pkgs/development/tools/flatpak-builder/default.nix
+++ b/pkgs/development/tools/flatpak-builder/default.nix
@@ -37,7 +37,7 @@
 }:
 
 let
-  version = "1.0.5";
+  version = "1.0.6";
 in stdenv.mkDerivation rec {
   name = "flatpak-builder-${version}";
 
@@ -45,7 +45,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${name}.tar.xz";
-    sha256 = "1l5hpxkc7f3mp9v8wyagpbc8vvfn0m0jq8rsk1h7vwyyjmijv6mb";
+    sha256 = "1fw9lzf9cy3fnnvn9q3g0schxcj7kaj6kjijhrmcmsfcnzbjlmrv";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix b/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix
index 139ffef186b5..ff59fa7cf8a3 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix
@@ -1,11 +1,19 @@
-{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler
+{ stdenv, fetchFromGitHub, ocaml, findlib, dune, js_of_ocaml-compiler
 , camlp4, ocsigen_deriving
 }:
 
 stdenv.mkDerivation rec {
+	version = "3.2.1";
 	name = "js_of_ocaml-camlp4-${version}"; 
 
-	inherit (js_of_ocaml-compiler) version src installPhase meta;
+	src = fetchFromGitHub {
+		owner = "ocsigen";
+		repo = "js_of_ocaml";
+		rev = version;
+		sha256 = "1v2hfq0ra9j07yz6pj6m03hrvgys4vmx0gclchv94yywpb2wc7ik";
+	};
+
+	inherit (js_of_ocaml-compiler) installPhase meta;
 
 	buildInputs = [ ocaml findlib dune camlp4 ocsigen_deriving ];
 
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
index 94be7132b796..c5a345f505b7 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
@@ -8,13 +8,13 @@ else
 
 stdenv.mkDerivation rec {
 	name = "js_of_ocaml-compiler-${version}";
-	version = "3.2.1";
+	version = "3.3.0";
 
 	src = fetchFromGitHub {
 		owner = "ocsigen";
 		repo = "js_of_ocaml";
 		rev = version;
-		sha256 = "1v2hfq0ra9j07yz6pj6m03hrvgys4vmx0gclchv94yywpb2wc7ik";
+		sha256 = "0bg8x2s3f24c8ia2g293ikd5yg0yjw3hkdgdql59c8k2amqin8f8";
 	};
 
 	buildInputs = [ ocaml findlib dune cmdliner cppo ];
diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix
new file mode 100644
index 000000000000..6f8b4f824b3f
--- /dev/null
+++ b/pkgs/development/tools/omnisharp-roslyn/default.nix
@@ -0,0 +1,41 @@
+{ stdenv
+, fetchurl
+, mono5
+, makeWrapper
+}:
+
+stdenv.mkDerivation rec {
+
+  name = "omnisharp-roslyn-${version}";
+  version = "1.32.8";
+  
+  src = fetchurl {
+    url = "https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v${version}/omnisharp-mono.tar.gz";
+    sha256 = "0k2a4awmzb7ppll2skyzaa94n3hxqm35ffibl0sygldk3symzwgp";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  preUnpack = ''
+    mkdir src
+    cd src
+    sourceRoot=.
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cd ..
+		cp -r src $out/
+    ls -al $out/src
+    makeWrapper ${mono5}/bin/mono $out/bin/omnisharp \
+    --add-flags "$out/src/OmniSharp.exe"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "OmniSharp based on roslyn workspaces";
+    platforms = platforms.linux;
+    license = licenses.mit;
+    maintainers = with maintainers; [ tesq0 ];
+  };
+
+}
diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix
index 88fd212dad2e..3e2128ff0850 100644
--- a/pkgs/development/tools/rust/cargo-expand/default.nix
+++ b/pkgs/development/tools/rust/cargo-expand/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-expand";
-  version = "0.4.11";
+  version = "0.4.12";
 
   src = fetchFromGitHub {
     owner = "dtolnay";
     repo = pname;
     rev = version;
-    sha256 = "051hy2320mqdxvafhafwnk1n8q2sq2d7jyhx5bbxvqmjjm55lg8h";
+    sha256 = "0m57v7mh7wdl0rdbad7vkvcgy93p9gcb971wap8i5nzjvzmp4wlb";
   };
 
-  cargoSha256 = "0d1j01nrq5j0yrgd85lnvg1mzalcd8xadkza3yvwnqzf554idrcy";
+  cargoSha256 = "1wvqxj2w02d6zhyw3z5v0w4bfmbmldh63ygmvfxa3ngfb36gcacz";
 
   meta = with stdenv.lib; {
     description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code";
diff --git a/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch b/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch
index 60f29fccdc34..74da8d6102e7 100644
--- a/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch
+++ b/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch
@@ -1,32 +1,25 @@
-From c21cc756b69a5f33c8a7758b746a816f40f55932 Mon Sep 17 00:00:00 2001
-From: Leon Isenberg <ljli@users.noreply.github.com>
-Date: Sat, 28 Oct 2017 17:58:17 +0200
-Subject: [PATCH] nix customization: patchelf installed binaries
-
----
- src/rustup-dist/src/component/package.rs | 21 ++++++++++++++++++++-
- 1 file changed, 20 insertions(+), 1 deletion(-)
-
-diff --git a/src/rustup-dist/src/component/package.rs b/src/rustup-dist/src/component/package.rs
-index 70c54dcd..f0318986 100644
---- a/src/rustup-dist/src/component/package.rs
-+++ b/src/rustup-dist/src/component/package.rs
-@@ -100,7 +100,10 @@ impl Package for DirectoryPackage {
-             let src_path = root.join(&path);
- 
+diff --git a/src/dist/component/package.rs b/src/dist/component/package.rs
+index e0fdea28..38d9d0e4 100644
+--- a/src/dist/component/package.rs
++++ b/src/dist/component/package.rs
+@@ -104,10 +104,11 @@ impl Package for DirectoryPackage {
              match &*part.0 {
--                "file" => builder.copy_file(path.clone(), &src_path)?,
-+                "file" => {
-+                    builder.copy_file(path.clone(), &src_path)?;
+                 "file" => {
+                     if self.copy {
+-                        builder.copy_file(path.clone(), &src_path)?
++                        builder.copy_file(path.clone(), &src_path)?;
+                     } else {
+-                        builder.move_file(path.clone(), &src_path)?
++                        builder.move_file(path.clone(), &src_path)?;
+                     }
 +                    nix_patchelf_if_needed(&target.prefix().path().join(path.clone()), &src_path)
-+                }
-                 "dir" => builder.copy_dir(path.clone(), &src_path)?,
-                 _ => return Err(ErrorKind::CorruptComponent(name.to_owned()).into()),
-             }
-@@ -118,6 +121,22 @@ impl Package for DirectoryPackage {
+                 }
+                 "dir" => {
+                     if self.copy {
+@@ -132,6 +133,22 @@ impl Package for DirectoryPackage {
      }
  }
- 
+
 +fn nix_patchelf_if_needed(dest_path: &Path, src_path: &Path) {
 +    let is_bin = if let Some(p) = src_path.parent() {
 +        p.ends_with("bin")
@@ -46,6 +39,3 @@ index 70c54dcd..f0318986 100644
  // On Unix we need to set up the file permissions correctly so
  // binaries are executable and directories readable. This shouldn't be
  // necessary: the source files *should* have the right permissions,
--- 
-2.17.1
-
diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix
index 1177423869c1..3eb0760b2220 100644
--- a/pkgs/development/tools/rust/rustup/default.nix
+++ b/pkgs/development/tools/rust/rustup/default.nix
@@ -3,17 +3,17 @@
 , pkgconfig, curl, Security }:
 
 rustPlatform.buildRustPackage rec {
-  name = "rustup-${version}";
-  version = "1.17.0";
+  pname = "rustup";
+  version = "1.18.1";
 
   src = fetchFromGitHub {
     owner = "rust-lang";
     repo = "rustup.rs";
     rev = version;
-    sha256 = "1mf92z89wqqaj3cg2cqf6basvcz47krldmy8ianfkzp323fimqmn";
+    sha256 = "0932n708ikxzjv7y78zcrnnnps3rgimsnpaximhm9vmjjnkdgm7x";
   };
 
-  cargoSha256 = "0y7kbihdrpd35dw24qqqzmccvjdy6arka10p5rnv38d420f1bpzd";
+  cargoSha256 = "0kw8a9prqjf939g0h8ryyhlm1n84fwdycvl0nkykkwlfqd6hh9hb";
 
   nativeBuildInputs = [ pkgconfig ];
 
@@ -49,9 +49,16 @@ rustPlatform.buildRustPackage rec {
     # tries to create .rustup
     export HOME=$(mktemp -d)
     mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions}
-    $out/bin/rustup completions bash > "$out/share/bash-completion/completions/rustup"
-    $out/bin/rustup completions fish > "$out/share/fish/vendor_completions.d/rustup.fish"
-    $out/bin/rustup completions zsh >  "$out/share/zsh/site-functions/_rustup"
+
+    # generate completion scripts for rustup
+    $out/bin/rustup completions bash rustup > "$out/share/bash-completion/completions/rustup"
+    $out/bin/rustup completions fish rustup > "$out/share/fish/vendor_completions.d/rustup.fish"
+    $out/bin/rustup completions zsh rustup >  "$out/share/zsh/site-functions/_rustup"
+
+    # generate completion scripts for cargo
+    # Note: fish completion script is not supported.
+    $out/bin/rustup completions bash cargo > "$out/share/bash-completion/completions/cargo"
+    $out/bin/rustup completions zsh cargo >  "$out/share/zsh/site-functions/_cargo"
   '';
 
   meta = with stdenv.lib; {