about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2019-09-28 15:30:15 +0000
committerAlyssa Ross <hi@alyssa.is>2019-09-28 22:14:42 +0000
commit80e4dc93ce4bb109cd00a98f0b39151f09de9d9b (patch)
tree64aa611a6a199dc0f40fc56d050d99e125e5c830 /nixpkgs/pkgs/development
parentbfa679f5a8e9beff6008ea0e9d5eabfa68018e20 (diff)
parent2436c27541b2f52deea3a4c1691216a02152e729 (diff)
downloadnixlib-80e4dc93ce4bb109cd00a98f0b39151f09de9d9b.tar
nixlib-80e4dc93ce4bb109cd00a98f0b39151f09de9d9b.tar.gz
nixlib-80e4dc93ce4bb109cd00a98f0b39151f09de9d9b.tar.bz2
nixlib-80e4dc93ce4bb109cd00a98f0b39151f09de9d9b.tar.lz
nixlib-80e4dc93ce4bb109cd00a98f0b39151f09de9d9b.tar.xz
nixlib-80e4dc93ce4bb109cd00a98f0b39151f09de9d9b.tar.zst
nixlib-80e4dc93ce4bb109cd00a98f0b39151f09de9d9b.zip
Merge commit '2436c27541b2f52deea3a4c1691216a02152e729'
Diffstat (limited to 'nixpkgs/pkgs/development')
-rw-r--r--nixpkgs/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix2
-rw-r--r--nixpkgs/pkgs/development/arduino/arduino-core/default.nix2
-rw-r--r--nixpkgs/pkgs/development/compilers/dtc/default.nix8
-rw-r--r--nixpkgs/pkgs/development/compilers/gcc/8/default.nix7
-rw-r--r--nixpkgs/pkgs/development/compilers/gcc/9/default.nix7
-rw-r--r--nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/git.json4
-rw-r--r--nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix9
-rw-r--r--nixpkgs/pkgs/development/compilers/ghcjs-ng/common-overrides.nix3
-rw-r--r--nixpkgs/pkgs/development/compilers/ghcjs-ng/default.nix1
-rw-r--r--nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix13
-rw-r--r--nixpkgs/pkgs/development/compilers/manticore/default.nix6
-rw-r--r--nixpkgs/pkgs/development/compilers/mono/generic.nix4
-rw-r--r--nixpkgs/pkgs/development/compilers/mozart/default.nix89
-rw-r--r--nixpkgs/pkgs/development/compilers/openjdk/8.nix2
-rw-r--r--nixpkgs/pkgs/development/compilers/terra/default.nix45
-rw-r--r--nixpkgs/pkgs/development/compilers/terra/nix-cflags.patch22
-rw-r--r--nixpkgs/pkgs/development/haskell-modules/configuration-common.nix15
-rw-r--r--nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix44
-rw-r--r--nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml153
-rw-r--r--nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix1234
-rw-r--r--nixpkgs/pkgs/development/haskell-modules/patches/amazonka-Allow-http-client-0.6.patch24
-rw-r--r--nixpkgs/pkgs/development/haskell-modules/patches/amazonka-core-Allow-http-client-0.6.patch26
-rw-r--r--nixpkgs/pkgs/development/interpreters/janet/default.nix6
-rw-r--r--nixpkgs/pkgs/development/java-modules/jogl/default.nix9
-rw-r--r--nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix9
-rw-r--r--nixpkgs/pkgs/development/libraries/gmp/6.x.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/libdrm/default.nix12
-rw-r--r--nixpkgs/pkgs/development/libraries/libfido2/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libgdiplus/default.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/libipt/default.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/libmediainfo/default.nix4
-rw-r--r--nixpkgs/pkgs/development/libraries/libotr/default.nix3
-rw-r--r--nixpkgs/pkgs/development/libraries/libproxy/default.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/libvterm-neovim/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/mimalloc/default.nix46
-rw-r--r--nixpkgs/pkgs/development/libraries/mono-zeroconf/default.nix25
-rw-r--r--nixpkgs/pkgs/development/libraries/qhull/default.nix2
-rw-r--r--nixpkgs/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh2
-rw-r--r--nixpkgs/pkgs/development/libraries/science/networking/ns-3/default.nix (renamed from nixpkgs/pkgs/development/libraries/science/networking/ns3/default.nix)72
-rw-r--r--nixpkgs/pkgs/development/libraries/vtk/default.nix8
-rw-r--r--nixpkgs/pkgs/development/libraries/yubico-pam/default.nix6
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix14
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix14
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-package-system.nix25
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix4
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix24
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix4
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix4
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix4
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-xmlspam.nix34
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix4
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix4
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix4
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix4
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix34
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix4
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/introspect-environment.nix26
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix4
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix6
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix4
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix30
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix4
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mk-string-metrics.nix26
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix4
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove-asdf.nix25
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix4
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix4
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix26
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix44
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix43
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix29
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix31
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix38
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix43
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-clipboard.nix26
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-cltl2.nix26
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix4
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix37
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-opts.nix25
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix4
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix24
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt37
-rw-r--r--nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix674
-rw-r--r--nixpkgs/pkgs/development/lua-modules/overrides.nix11
-rw-r--r--nixpkgs/pkgs/development/node-packages/node-packages-v10.json2
-rw-r--r--nixpkgs/pkgs/development/node-packages/node-packages-v10.nix1965
-rw-r--r--nixpkgs/pkgs/development/node-packages/node-packages-v12.nix20
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/containers/default.nix54
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/iter/default.nix (renamed from nixpkgs/pkgs/development/ocaml-modules/sequence/default.nix)16
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix14
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/ocaml-protoc/default.nix38
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/odoc/default.nix14
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/optint/default.nix28
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/owee/default.nix20
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix18
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/printbox/default.nix10
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/spacetime_lib/default.nix22
-rw-r--r--nixpkgs/pkgs/development/python-modules/Logbook/default.nix3
-rw-r--r--nixpkgs/pkgs/development/python-modules/algebraic-data-types/default.nix28
-rw-r--r--nixpkgs/pkgs/development/python-modules/astropy/default.nix3
-rw-r--r--nixpkgs/pkgs/development/python-modules/aws-adfs/default.nix10
-rw-r--r--nixpkgs/pkgs/development/python-modules/cairocffi/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/cairocffi/dlopen-paths.patch73
-rw-r--r--nixpkgs/pkgs/development/python-modules/cheroot/default.nix3
-rw-r--r--nixpkgs/pkgs/development/python-modules/csvs-to-sqlite/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/dotnetcore2/default.nix59
-rw-r--r--nixpkgs/pkgs/development/python-modules/dotnetcore2/runtime.patch19
-rw-r--r--nixpkgs/pkgs/development/python-modules/dynd/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/flask-oauthlib/default.nix29
-rw-r--r--nixpkgs/pkgs/development/python-modules/flask-sqlalchemy/default.nix8
-rw-r--r--nixpkgs/pkgs/development/python-modules/h11/default.nix3
-rw-r--r--nixpkgs/pkgs/development/python-modules/impacket/default.nix24
-rw-r--r--nixpkgs/pkgs/development/python-modules/ipykernel/default.nix3
-rw-r--r--nixpkgs/pkgs/development/python-modules/keyring/default.nix15
-rw-r--r--nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix7
-rw-r--r--nixpkgs/pkgs/development/python-modules/license-expression/default.nix1
-rw-r--r--nixpkgs/pkgs/development/python-modules/lxml/default.nix2
-rw-r--r--nixpkgs/pkgs/development/python-modules/mypy/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/nbconvert/default.nix3
-rw-r--r--nixpkgs/pkgs/development/python-modules/nbformat/default.nix3
-rw-r--r--nixpkgs/pkgs/development/python-modules/nbval/default.nix3
-rw-r--r--nixpkgs/pkgs/development/python-modules/ncclient/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/notebook/default.nix3
-rw-r--r--nixpkgs/pkgs/development/python-modules/pdf2image/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/picos/default.nix36
-rw-r--r--nixpkgs/pkgs/development/python-modules/portend/default.nix3
-rw-r--r--nixpkgs/pkgs/development/python-modules/pycurl2/default.nix14
-rw-r--r--nixpkgs/pkgs/development/python-modules/pytest-check/default.nix29
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-engineio/default.nix26
-rw-r--r--nixpkgs/pkgs/development/python-modules/python-language-server/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/pyzmq/default.nix3
-rw-r--r--nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix4
-rw-r--r--nixpkgs/pkgs/development/python-modules/trustme/default.nix3
-rw-r--r--nixpkgs/pkgs/development/python-modules/typed-ast/default.nix12
-rw-r--r--nixpkgs/pkgs/development/python-modules/uvicorn/default.nix24
-rw-r--r--nixpkgs/pkgs/development/python-modules/uvicorn/setup.patch13
-rw-r--r--nixpkgs/pkgs/development/python-modules/uvloop/darwin_sandbox.patch28
-rw-r--r--nixpkgs/pkgs/development/python-modules/uvloop/default.nix5
-rw-r--r--nixpkgs/pkgs/development/python-modules/websockets/default.nix20
-rw-r--r--nixpkgs/pkgs/development/r-modules/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/ammonite/default.nix29
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/bingrep/default.nix23
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/flow/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/tflint/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix12
-rw-r--r--nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/cask/default.nix15
-rw-r--r--nixpkgs/pkgs/development/tools/golangci-lint/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/ctags/wrapped.nix14
-rw-r--r--nixpkgs/pkgs/development/tools/misc/elfinfo/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/hydra-cli/default.nix31
-rw-r--r--nixpkgs/pkgs/development/tools/misc/mkcert/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/misc/terraform-lsp/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/misc/ycmd/default.nix33
-rw-r--r--nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix6
-rw-r--r--nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix22
-rw-r--r--nixpkgs/pkgs/development/tools/pgformatter/default.nix4
-rw-r--r--nixpkgs/pkgs/development/tools/skopeo/default.nix4
162 files changed, 4547 insertions, 1867 deletions
diff --git a/nixpkgs/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/nixpkgs/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
index 02aa6567c1a9..6bcfcfc30235 100644
--- a/nixpkgs/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
+++ b/nixpkgs/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
@@ -103,6 +103,6 @@ rec {
     cp -r ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/sysroot/usr/include $out/include
     chmod +w $out/include
     cp -r ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/sysroot/usr/include/${targetInfo.triple}/* $out/include
-    ln -s ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/platforms/android-${stdenv.hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/lib $out/lib
+    ln -s ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/platforms/android-${stdenv.hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/${if hostInfo.arch == "x86_64" then "lib64" else "lib"} $out/lib
   '';
 }
diff --git a/nixpkgs/pkgs/development/arduino/arduino-core/default.nix b/nixpkgs/pkgs/development/arduino/arduino-core/default.nix
index 2897bac06144..840fbff60ebd 100644
--- a/nixpkgs/pkgs/development/arduino/arduino-core/default.nix
+++ b/nixpkgs/pkgs/development/arduino/arduino-core/default.nix
@@ -200,7 +200,7 @@ stdenv.mkDerivation rec {
 
     # avrdude_bin is linked against libtinfo.so.5
     mkdir $out/lib/
-    ln -s ${lib.makeLibraryPath [ncurses5]}/libncursesw.so.5 $out/lib/libtinfo.so.5
+    ln -s ${lib.makeLibraryPath [ncurses5]}/libtinfo.so.5 $out/lib/libtinfo.so.5
 
     ${stdenv.lib.optionalString withTeensyduino ''
       # Patch the Teensy loader binary
diff --git a/nixpkgs/pkgs/development/compilers/dtc/default.nix b/nixpkgs/pkgs/development/compilers/dtc/default.nix
index d92d712a3ff7..eea75c5ace1f 100644
--- a/nixpkgs/pkgs/development/compilers/dtc/default.nix
+++ b/nixpkgs/pkgs/development/compilers/dtc/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchgit, flex, bison, pkgconfig, which
-, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform, python2, swig
+, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform, python, swig
 }:
 
 stdenv.mkDerivation rec {
@@ -12,14 +12,14 @@ stdenv.mkDerivation rec {
     sha256 = "1jhhfrg22h53lvm2lqhd66pyk20pil08ry03wcwyx1c3ln27k73z";
   };
 
-  nativeBuildInputs = [ flex bison pkgconfig which ] ++ lib.optionals pythonSupport [ python2 swig ];
-  buildInputs = lib.optionals pythonSupport [ python2 ];
+  nativeBuildInputs = [ flex bison pkgconfig which ] ++ lib.optionals pythonSupport [ python swig ];
+  buildInputs = lib.optionals pythonSupport [ python ];
 
   postPatch = ''
     patchShebangs pylibfdt/
   '';
 
-  makeFlags = lib.optionals (!pythonSupport) [ "NO_PYTHON=1" ];
+  makeFlags = [ "PYTHON=python" ];
   installFlags = [ "INSTALL=install" "PREFIX=$(out)" "SETUP_PREFIX=$(out)" ];
 
   meta = with lib; {
diff --git a/nixpkgs/pkgs/development/compilers/gcc/8/default.nix b/nixpkgs/pkgs/development/compilers/gcc/8/default.nix
index 129ca72251fc..e25c7b6016af 100644
--- a/nixpkgs/pkgs/development/compilers/gcc/8/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gcc/8/default.nix
@@ -186,7 +186,12 @@ stdenv.mkDerivation ({
             sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR'
         ''
         )
-    else "");
+    else "")
+      + stdenv.lib.optionalString targetPlatform.isAvr ''
+	        makeFlagsArray+=(
+	           'LIMITS_H_TEST=false'
+	        )
+	      '';
 
   inherit noSysDirs staticCompiler crossStageStatic
     libcCross crossMingw;
diff --git a/nixpkgs/pkgs/development/compilers/gcc/9/default.nix b/nixpkgs/pkgs/development/compilers/gcc/9/default.nix
index 506cfee7f498..de4d893b99e2 100644
--- a/nixpkgs/pkgs/development/compilers/gcc/9/default.nix
+++ b/nixpkgs/pkgs/development/compilers/gcc/9/default.nix
@@ -185,7 +185,12 @@ stdenv.mkDerivation ({
             sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR'
         ''
         )
-    else "");
+    else "")
+      + stdenv.lib.optionalString targetPlatform.isAvr ''
+	        makeFlagsArray+=(
+	           'LIMITS_H_TEST=false'
+	        )
+	      '';
 
   inherit noSysDirs staticCompiler crossStageStatic
     libcCross crossMingw;
diff --git a/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix b/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix
index 53b6dd431342..c54c782fafa6 100644
--- a/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix
+++ b/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix
@@ -2,6 +2,10 @@
 
 let inherit (haskellLib) doJailbreak dontHaddock;
 in self: super: {
+  ghc-api-ghcjs = super.ghc-api-ghcjs.override
+  {
+    happy = self.happy_1_19_5;
+  };
   haddock-library-ghcjs = doJailbreak super.haddock-library-ghcjs;
   haddock-api-ghcjs = doJailbreak (dontHaddock super.haddock-api-ghcjs);
 }
diff --git a/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/git.json b/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/git.json
index 37861b96e7aa..1114e1a12905 100644
--- a/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/git.json
+++ b/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/git.json
@@ -1,6 +1,6 @@
 {
   "url": "https://github.com/ghcjs/ghcjs",
-  "rev": "75c61af32d73def4409d1fe7b64659c1d28cd075",
-  "sha256": "18pixn6xdz6qp941yhxfnmwi463jnpskmg473lv07vvgy4hpgjhj",
+  "rev": "e87195eaa2bc7e320e18cf10386802bc90b7c874",
+  "sha256": "02mwkf7aagxqi142gcmq048244apslrr72p568akcab9s0fn2gvy",
   "fetchSubmodules": true
 }
diff --git a/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix b/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix
index a89ab15c55fd..b957a6aa9e10 100644
--- a/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix
+++ b/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix
@@ -59,20 +59,21 @@
     }) {};
 
   ghc-api-ghcjs = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, containers
+    ({ mkDerivation, alex, array, base, binary, bytestring, containers
     , deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghc-heap
-    , ghci-ghcjs, hpc, process, stdenv, template-haskell-ghcjs
+    , ghci-ghcjs, happy, hpc, process, stdenv, template-haskell-ghcjs
     , terminfo, time, transformers, unix
     }:
     mkDerivation {
       pname = "ghc-api-ghcjs";
-      version = "8.6.2";
+      version = "8.6.5";
       src = configuredSrc + /lib/ghc-api-ghcjs;
       libraryHaskellDepends = [
         array base binary bytestring containers deepseq directory filepath
         ghc-boot ghc-boot-th ghc-heap ghci-ghcjs hpc process
         template-haskell-ghcjs terminfo time transformers unix
       ];
+      libraryToolDepends = [ alex happy ];
       homepage = "http://www.haskell.org/ghc/";
       description = "The GHC API (customized for GHCJS)";
       license = stdenv.lib.licenses.bsd3;
@@ -107,7 +108,7 @@
         base binary bytestring containers ghc-prim ghci-ghcjs
         template-haskell-ghcjs
       ];
-      homepage = "https://github.com/ghcjs";
+      homepage = "http://github.com/ghcjs";
       license = stdenv.lib.licenses.mit;
     }) {};
 
diff --git a/nixpkgs/pkgs/development/compilers/ghcjs-ng/common-overrides.nix b/nixpkgs/pkgs/development/compilers/ghcjs-ng/common-overrides.nix
index 52f3ad497ad6..00a071651eda 100644
--- a/nixpkgs/pkgs/development/compilers/ghcjs-ng/common-overrides.nix
+++ b/nixpkgs/pkgs/development/compilers/ghcjs-ng/common-overrides.nix
@@ -1,8 +1,7 @@
-{ haskellLib, alex, happy }:
+{ haskellLib }:
 
 let inherit (haskellLib) addBuildTools appendConfigureFlag dontHaddock doJailbreak;
 in self: super: {
-  ghc-api-ghcjs = addBuildTools super.ghc-api-ghcjs [alex happy];
   ghcjs = dontHaddock (appendConfigureFlag (doJailbreak super.ghcjs) "-fno-wrapper-install");
   haddock-library-ghcjs = dontHaddock super.haddock-library-ghcjs;
   system-fileio = doJailbreak super.system-fileio;
diff --git a/nixpkgs/pkgs/development/compilers/ghcjs-ng/default.nix b/nixpkgs/pkgs/development/compilers/ghcjs-ng/default.nix
index 068d7b578dfe..e668be8e0740 100644
--- a/nixpkgs/pkgs/development/compilers/ghcjs-ng/default.nix
+++ b/nixpkgs/pkgs/development/compilers/ghcjs-ng/default.nix
@@ -34,7 +34,6 @@ let
 
       (callPackage ./common-overrides.nix {
         inherit haskellLib;
-        inherit (bootPkgs) alex happy;
       })
       ghcjsDepOverrides
     ]);
diff --git a/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix b/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix
index 1349b7f0dddc..a6e3dfff4e03 100644
--- a/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix
+++ b/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix
@@ -14,6 +14,11 @@ let drv = stdenv.mkDerivation rec {
       url = "https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrsdk-11_0_2-linux-x64-b${version}.tar.gz";
       sha256 = "121yzgvkfx7lq0k9s8wjnhz09a564br5y7zlkxgh191sbm2i7zdi";
     }
+  else if stdenv.hostPlatform.system == "x86_64-darwin" then
+    fetchurl {
+      url = "https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrsdk-11_0_2-osx-x64-b${version}.tar.gz";
+      sha256 = "1ly6kf59knvzbr2pjkc9fqyzfs28pdvnqg5pfffr8zp14xm44zmd";
+    }
   else
     throw "unsupported system: ${stdenv.hostPlatform.system}";
 
@@ -28,20 +33,20 @@ let drv = stdenv.mkDerivation rec {
     jrePath=$out/jre
   '';
 
-  postFixup = ''
+  postFixup = lib.optionalString (!stdenv.isDarwin) ''
     find $out -type f -perm -0100 \
         -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
         --set-rpath "$rpath" {} \;
     find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;
   '';
 
-  rpath = lib.makeLibraryPath ([
+  rpath = lib.optionalString (!stdenv.isDarwin) (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 zlib
     (placeholder "out")
   ] ++ (with xorg; [
     libX11 libXext libXtst libXi libXp libXt libXrender libXxf86vm
-  ])) + ":${placeholder "out"}/lib/jli";
+  ])) + ":${placeholder "out"}/lib/jli");
 
   passthru.home = drv;
 
@@ -61,6 +66,6 @@ let drv = stdenv.mkDerivation rec {
     homepage = "https://bintray.com/jetbrains/intellij-jdk/";
     license = licenses.gpl2;
     maintainers = with maintainers; [ edwtjo ];
-    platforms = with platforms; [ "x86_64-linux" ];
+    platforms = with platforms; [ "x86_64-linux" "x86_64-darwin" ];
   };
 }; in drv
diff --git a/nixpkgs/pkgs/development/compilers/manticore/default.nix b/nixpkgs/pkgs/development/compilers/manticore/default.nix
index 6e0716659c79..1e9b77cfb79b 100644
--- a/nixpkgs/pkgs/development/compilers/manticore/default.nix
+++ b/nixpkgs/pkgs/development/compilers/manticore/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchFromGitHub, coreutils, autoreconfHook, smlnj }:
 
 let
-  rev= "47273c463fc3c5d0a0ae655cf75a4700bdb020b4";
+  rev= "4528ccacdfd53d36f5959c005b27cd7ab6175b83";
 in stdenv.mkDerivation {
   pname = "manticore";
-  version = "2018.09.29";
+  version = "2019.09.20";
  
   src = fetchFromGitHub {
     owner = "ManticoreProject";
     repo = "manticore";
-    sha256 = "1prrgp7ldkdnrdbj224qqkirw8bj72460ix97c96fy264j9c97cn";
+    sha256 = "1xz7msiq5x2c56zjxydbxlj6r001mm5zszcda6f6v5qfmmd1bakz";
     inherit rev;
   };
 
diff --git a/nixpkgs/pkgs/development/compilers/mono/generic.nix b/nixpkgs/pkgs/development/compilers/mono/generic.nix
index 9a2f01b9f3d5..e0cfe247b23a 100644
--- a/nixpkgs/pkgs/development/compilers/mono/generic.nix
+++ b/nixpkgs/pkgs/development/compilers/mono/generic.nix
@@ -42,10 +42,6 @@ stdenv.mkDerivation rec {
     ./autogen.sh --prefix $out $configureFlags
   '';
 
-  # Attempt to fix this error when running "mcs --version":
-  # The file /nix/store/xxx-mono-2.4.2.1/lib/mscorlib.dll is an invalid CIL image
-  dontStrip = true;
-
   # We want pkg-config to take priority over the dlls in the Mono framework and the GAC
   # because we control pkg-config
   patches = [ ./pkgconfig-before-gac.patch ];
diff --git a/nixpkgs/pkgs/development/compilers/mozart/default.nix b/nixpkgs/pkgs/development/compilers/mozart/default.nix
new file mode 100644
index 000000000000..97634bca8ef7
--- /dev/null
+++ b/nixpkgs/pkgs/development/compilers/mozart/default.nix
@@ -0,0 +1,89 @@
+{ lib
+, fetchFromGitHub
+, fetchurl
+, cmake
+, unzip
+, makeWrapper
+, boost
+, llvmPackages
+, llvmPackages_4
+, gmp
+, emacs
+, emacs25-nox
+, jre_headless
+, tcl
+, tk
+}:
+
+let stdenv = llvmPackages.stdenv;
+
+in stdenv.mkDerivation rec {
+  pname = "mozart2";
+  version = "2.0.1";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/mozart/mozart2/releases/download/v${version}/${name}-Source.zip";
+    sha256 = "1mad9z5yzzix87cdb05lmif3960vngh180s2mb66cj5gwh5h9dll";
+  };
+
+  # This is a workaround to avoid using sbt.
+  # I guess it is acceptable to fetch the bootstrapping compiler in binary form.
+  bootcompiler = fetchurl {
+    url = "https://github.com/layus/mozart2/releases/download/v2.0.0-beta.1/bootcompiler.jar";
+    sha256 = "1hgh1a8hgzgr6781as4c4rc52m2wbazdlw3646s57c719g5xphjz";
+  };
+
+  postConfigure = ''
+    cp ${bootcompiler} bootcompiler/bootcompiler.jar
+  '';
+
+  nativeBuildInputs = [ cmake makeWrapper unzip ];
+
+  # We cannot compile with both gcc and clang, but we need clang during the
+  # process, so we compile everything with clang.
+  # BUT, we need clang4 for parsing, and a more recent clang for compiling.
+  cmakeFlags = [
+    "-DCMAKE_CXX_COMPILER=${llvmPackages.clang}/bin/clang++"
+    "-DCMAKE_C_COMPILER=${llvmPackages.clang}/bin/clang"
+    "-DBoost_USE_STATIC_LIBS=OFF"
+    "-DMOZART_BOOST_USE_STATIC_LIBS=OFF"
+    "-DCMAKE_PROGRAM_PATH=${llvmPackages_4.clang}/bin"
+    # Rationale: Nix's cc-wrapper needs to see a compile flag (like -c) to
+    # infer that it is not a linking call, and stop trashing the command line
+    # with linker flags.
+    # As it does not recognise -emit-ast, we pass -c immediately overridden
+    # by -emit-ast.
+    # The remaining is just the default flags that we cannot reuse and need
+    # to repeat here.
+    "-DMOZART_GENERATOR_FLAGS='-c;-emit-ast;--std=c++0x;-Wno-invalid-noreturn;-Wno-return-type;-Wno-braced-scalar-init'"
+    # We are building with clang, as nix does not support having clang and
+    # gcc together as compilers and we need clang for the sources generation.
+    # However, clang emits tons of warnings about gcc's atomic-base library.
+    "-DCMAKE_CXX_FLAGS=-Wno-braced-scalar-init"
+  ] ++ lib.optional stdenv.isDarwin "-DCMAKE_FIND_FRAMEWORK=LAST";
+
+  fixupPhase = ''
+    wrapProgram $out/bin/oz --set OZEMACS ${emacs}/bin/emacs
+  '';
+
+  buildInputs = [
+    boost
+    llvmPackages_4.llvm
+    llvmPackages_4.clang
+    llvmPackages_4.clang-unwrapped
+    gmp
+    emacs25-nox
+    jre_headless
+    tcl
+    tk
+  ];
+
+  meta = {
+    description = "An open source implementation of Oz 3.";
+    maintainers = [ lib.maintainers.layus ];
+    license = lib.licenses.bsd2;
+    homepage = "https://mozart.github.io";
+  };
+
+}
diff --git a/nixpkgs/pkgs/development/compilers/openjdk/8.nix b/nixpkgs/pkgs/development/compilers/openjdk/8.nix
index 1d356945a4f1..1a5848cd1a68 100644
--- a/nixpkgs/pkgs/development/compilers/openjdk/8.nix
+++ b/nixpkgs/pkgs/development/compilers/openjdk/8.nix
@@ -219,6 +219,8 @@ let
       ln -s $jre/lib/openjdk/jre $out/jre
     '';
 
+    propagatedBuildInputs = [ setJavaClassPath ];
+
     preFixup = ''
       # Propagate the setJavaClassPath setup hook from the JRE so that
       # any package that depends on the JRE has $CLASSPATH set up
diff --git a/nixpkgs/pkgs/development/compilers/terra/default.nix b/nixpkgs/pkgs/development/compilers/terra/default.nix
index dea6df1b7aa4..63557d61019a 100644
--- a/nixpkgs/pkgs/development/compilers/terra/default.nix
+++ b/nixpkgs/pkgs/development/compilers/terra/default.nix
@@ -1,29 +1,40 @@
-{ stdenv, fetchFromGitHub, fetchurl, llvmPackages, ncurses, lua }:
+{ stdenv, fetchurl, fetchFromGitHub
+, llvmPackages, ncurses, lua
+}:
 
 let
   luajitArchive = "LuaJIT-2.0.5.tar.gz";
   luajitSrc = fetchurl {
-    url = "http://luajit.org/download/${luajitArchive}";
+    url    = "http://luajit.org/download/${luajitArchive}";
     sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7";
   };
 in
-
 stdenv.mkDerivation rec {
-  pname = "terra-git";
-  version = "1.0.0-beta1";
+  pname = "terra";
+  version = "1.0.0pre1175_${builtins.substring 0 7 src.rev}";
 
   src = fetchFromGitHub {
-    owner = "zdevito";
-    repo = "terra";
-    rev = "release-${version}";
-    sha256 = "1blv3mbmlwb6fxkck6487ck4qq67cbwq6s1zlp86hy2wckgf8q2c";
+    owner  = "zdevito";
+    repo   = "terra";
+    rev    = "ef6a75ffee15a30f3c74f4e6943851cfbc0fec3d";
+    sha256 = "0aky17vbv3d9zng34hp17p9zb00dbzwhvzsdjzrrqvk9lmyvix0s";
   };
 
+  nativeBuildInputs = [ lua ];
+  buildInputs = with llvmPackages; [ llvm clang-unwrapped ncurses ];
+
+  doCheck = true;
+  enableParallelBuilding = true;
+  hardeningDisable = [ "fortify" ];
   outputs = [ "bin" "dev" "out" "static" ];
 
+  patches = [ ./nix-cflags.patch ];
   postPatch = ''
-    substituteInPlace Makefile --replace \
-      '-lcurses' '-lncurses'
+    substituteInPlace Makefile \
+      --replace '-lcurses' '-lncurses'
+
+    substituteInPlace src/terralib.lua \
+      --subst-var-by NIX_LIBC_INCLUDE ${stdenv.lib.getDev stdenv.cc.libc}/include
   '';
 
   preBuild = ''
@@ -36,6 +47,8 @@ stdenv.mkDerivation rec {
     cp ${luajitSrc} build/${luajitArchive}
   '';
 
+  checkPhase = "(cd tests && ../terra run)";
+
   installPhase = ''
     install -Dm755 -t $bin/bin release/bin/terra
     install -Dm755 -t $out/lib release/lib/terra${stdenv.hostPlatform.extensions.sharedLibrary}
@@ -45,13 +58,11 @@ stdenv.mkDerivation rec {
     cp -rv release/include/terra $dev/include
   '';
 
-  buildInputs = with llvmPackages; [ lua llvm clang-unwrapped ncurses ];
-
   meta = with stdenv.lib; {
     description = "A low-level counterpart to Lua";
-    homepage = http://terralang.org/;
-    platforms = platforms.x86_64;
-    maintainers = with maintainers; [ jb55 ];
-    license = licenses.mit;
+    homepage    = http://terralang.org/;
+    platforms   = platforms.x86_64;
+    maintainers = with maintainers; [ jb55 thoughtpolice ];
+    license     = licenses.mit;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/terra/nix-cflags.patch b/nixpkgs/pkgs/development/compilers/terra/nix-cflags.patch
new file mode 100644
index 000000000000..339ae23cef65
--- /dev/null
+++ b/nixpkgs/pkgs/development/compilers/terra/nix-cflags.patch
@@ -0,0 +1,22 @@
+diff --git a/src/terralib.lua b/src/terralib.lua
+index 351238d..e638c90 100644
+--- a/src/terralib.lua
++++ b/src/terralib.lua
+@@ -3395,6 +3395,17 @@ function terra.includecstring(code,cargs,target)
+     	args:insert("-internal-isystem")
+     	args:insert(path)
+     end
++
++    -- NOTE(aseipp): include relevant Nix header files
++    args:insert("-isystem")
++    args:insert("@NIX_LIBC_INCLUDE@")
++
++    local nix_cflags = os.getenv('NIX_CFLAGS_COMPILE')
++    if nix_cflags ~= nil then
++        for w in nix_cflags:gmatch("%S+") do
++          args:insert(w)
++        end
++    end
+     
+     if cargs then
+         args:insertall(cargs)
diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix
index dde4092327b8..fd8bfef030ae 100644
--- a/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix
+++ b/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix
@@ -146,16 +146,11 @@ self: super: {
     else super.halive;
 
   # Hakyll's tests are broken on Darwin (3 failures); and they require util-linux
-  hakyll = appendPatch
-    (if pkgs.stdenv.isDarwin
+  hakyll = if pkgs.stdenv.isDarwin
     then dontCheck (overrideCabal super.hakyll (drv: {
       testToolDepends = [];
     }))
-    else super.hakyll)
-    (pkgs.fetchpatch {
-      url = https://github.com/jaspervdj/hakyll/commit/25a4460b75b3c9f3ce339b3311b084d92994f5f1.patch;
-      sha256 = "sha256-F59WHt52LOKGsGoaD3LAIZFEMe9s9WHfGxQgSh9Q8uQ=";
-    });
+    else super.hakyll;
 
   double-conversion = if !pkgs.stdenv.isDarwin
     then super.double-conversion
@@ -1231,4 +1226,10 @@ self: super: {
   # The LTS-14.x version of optparse-applicative is too old.
   cabal-plan = super.cabal-plan.override { optparse-applicative = self.optparse-applicative_0_15_1_0; };
 
+  # https://github.com/brendanhay/amazonka/commit/657b70d174fe5cb61e56cb8b9c5e57f1ec216f2b
+  amazonka = appendPatch super.amazonka ./patches/amazonka-Allow-http-client-0.6.patch;
+
+  # https://github.com/brendanhay/amazonka/commit/657b70d174fe5cb61e56cb8b9c5e57f1ec216f2b
+  amazonka-core = appendPatch super.amazonka-core ./patches/amazonka-core-Allow-http-client-0.6.patch;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 41925d89550f..a233185cf4b8 100644
--- a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -96,27 +96,18 @@ self: super: {
     url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/hedgehog-1.0.patch";
     sha256 = "16gadh1hb74jqvzc9c893sffb1y2vjglblyrqjwp7xfhccq7g8yw";
   });
-  easytest = self.easytest_0_3;
+  easytest = markBroken super.easytest;
+  easytest_0_3 = markBroken super.easytest_0_3;
   regex-tdfa = appendPatch super.regex-tdfa (pkgs.fetchpatch {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-tdfa-1.2.3.1.patch";
     sha256 = "1lhas4s2ms666prb475gaw2bqw1v4y8cxi66sy20j727sx7ppjs7";
   });
-  cassava = appendPatch super.cassava (pkgs.fetchpatch {
-    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/cassava-0.5.1.0.patch";
-    sha256 = "11scwwjp94si90vb8v5yr291g9qwv5l223z8y0g0lc63932bp63g";
-  });
-  shakespeare = appendPatch super.shakespeare (pkgs.fetchpatch {
-    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/shakespeare-2.0.20.patch";
-    sha256 = "1dgx41ylahj4wk8r422aik0d7qdpawdga4gqz905nvlnhqjla58y";
-  });
   socks = appendPatch (doJailbreak super.socks) (pkgs.fetchpatch {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/socks-0.6.0.patch";
     sha256 = "1dsqmx0sw62x4glh43c0sbizd2y00v5xybiqadn96v6pmfrap5cp";
   });
-  lens = appendPatch (doJailbreak super.lens) (pkgs.fetchpatch {
-    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/lens-4.17.1.patch";
-    sha256 = "0w89ipi6dfkx5vlw4a64hh6fd0bm9hg33mwpghliyyxik5jmilv1";
-  });
+  lens = self.lens_4_18_1;
+  xmonad-contrib = self.xmonad-contrib_0_16;
   polyparse = appendPatch (doJailbreak super.polyparse) (pkgs.fetchpatch {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/polyparse-1.12.1.patch";
     sha256 = "01b2gnsq0x4fd9na8zpk6pajym55mbz64hgzawlwxdw0y6681kr5";
@@ -157,10 +148,37 @@ self: super: {
   });
   tls = self.tls_1_5_1;
   vault = dontHaddock super.vault;
+  monad-par = dontCheck super.monad-par;   # test suite does not compile in monad-par-0.3.4.8
 
   # TODO dont fetch patch if https://github.com/simonmar/alex/issues/140 is resolved
   alex = appendPatch super.alex (pkgs.fetchpatch {
     url = "https://github.com/simonmar/alex/commit/deaae6eddef5186bfd0e42e2c3ced39e26afa4d6.patch";
     sha256 = "1v40gmnw4lqyk271wngdwz8whpfdhmza58srbkka8icwwwrck3l5";
   });
+
+  # don't use obsolete "defaultUserHooks" in Setup.hs
+  X11 = appendPatch super.X11 (pkgs.fetchpatch {
+    url = "https://github.com/xmonad/X11/commit/8d817617afa1b54e6c50a9cc552dc1c0804c1794.patch";
+    sha256 = "0zsgzn0nvdxvqi5z0za3gzlhql2x5d5cr0kkr19j5c67fy177w6b";
+  });
+
+  # over-specified version constraints
+  aeson-diff = doJailbreak super.aeson-diff;
+
+  # https://github.com/sol/hpack/issues/371
+  hpack = markBrokenVersion "0.32.0" super.hpack;
+
+  # Upstream ships a broken Setup.hs file.
+  csv = overrideCabal super.csv (drv: { prePatch = "rm Setup.hs"; });
+
+  # Upstream ships a broken Setup.hs file.
+  string-qq = overrideSrc (dontCheck super.string-qq) {
+    src = pkgs.fetchFromGitHub {
+      owner = "dmwit";
+      repo = "string-qq";
+      rev = "b396f5ef36a9b23f1d3fafcc91f2222cd1ad24fe";
+      sha256 = "1z2f1yry8wi0jb38dgz7rl89zl63fhngf7xk4ljw240vn315jj8s";
+    };
+  };
+
 }
diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index dcfc40ef5ed1..68a05ff94115 100644
--- a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2871,146 +2871,6 @@ broken-packages:
   - amazon-emailer
   - amazon-emailer-client-snap
   - amazon-products
-  - amazonka
-  - amazonka-alexa-business
-  - amazonka-apigateway
-  - amazonka-application-autoscaling
-  - amazonka-appstream
-  - amazonka-appsync
-  - amazonka-athena
-  - amazonka-autoscaling
-  - amazonka-autoscaling-plans
-  - amazonka-batch
-  - amazonka-budgets
-  - amazonka-certificatemanager
-  - amazonka-certificatemanager-pca
-  - amazonka-cloud9
-  - amazonka-clouddirectory
-  - amazonka-cloudformation
-  - amazonka-cloudfront
-  - amazonka-cloudhsm
-  - amazonka-cloudhsmv2
-  - amazonka-cloudsearch
-  - amazonka-cloudsearch-domains
-  - amazonka-cloudtrail
-  - amazonka-cloudwatch
-  - amazonka-cloudwatch-events
-  - amazonka-cloudwatch-logs
-  - amazonka-codebuild
-  - amazonka-codecommit
-  - amazonka-codedeploy
-  - amazonka-codepipeline
-  - amazonka-codestar
-  - amazonka-cognito-identity
-  - amazonka-cognito-idp
-  - amazonka-cognito-sync
-  - amazonka-comprehend
-  - amazonka-config
-  - amazonka-connect
-  - amazonka-core
-  - amazonka-cost-explorer
-  - amazonka-cur
-  - amazonka-datapipeline
-  - amazonka-devicefarm
-  - amazonka-directconnect
-  - amazonka-discovery
-  - amazonka-dms
-  - amazonka-ds
-  - amazonka-dynamodb
-  - amazonka-dynamodb-dax
-  - amazonka-dynamodb-streams
-  - amazonka-ec2
-  - amazonka-ecr
-  - amazonka-ecs
-  - amazonka-efs
-  - amazonka-elasticache
-  - amazonka-elasticbeanstalk
-  - amazonka-elasticsearch
-  - amazonka-elastictranscoder
-  - amazonka-elb
-  - amazonka-elbv2
-  - amazonka-emr
-  - amazonka-fms
-  - amazonka-gamelift
-  - amazonka-glacier
-  - amazonka-glue
-  - amazonka-greengrass
-  - amazonka-guardduty
-  - amazonka-health
-  - amazonka-iam
-  - amazonka-importexport
-  - amazonka-inspector
-  - amazonka-iot
-  - amazonka-iot-analytics
-  - amazonka-iot-dataplane
-  - amazonka-iot-jobs-dataplane
-  - amazonka-kinesis
-  - amazonka-kinesis-analytics
-  - amazonka-kinesis-firehose
-  - amazonka-kinesis-video
-  - amazonka-kinesis-video-archived-media
-  - amazonka-kinesis-video-media
-  - amazonka-kms
-  - amazonka-lambda
-  - amazonka-lex-models
-  - amazonka-lex-runtime
-  - amazonka-lightsail
-  - amazonka-marketplace-analytics
-  - amazonka-marketplace-entitlement
-  - amazonka-marketplace-metering
-  - amazonka-mechanicalturk
-  - amazonka-mediaconvert
-  - amazonka-medialive
-  - amazonka-mediapackage
-  - amazonka-mediastore
-  - amazonka-mediastore-dataplane
-  - amazonka-migrationhub
-  - amazonka-ml
-  - amazonka-mobile
-  - amazonka-mq
-  - amazonka-opsworks
-  - amazonka-opsworks-cm
-  - amazonka-organizations
-  - amazonka-pinpoint
-  - amazonka-polly
-  - amazonka-pricing
-  - amazonka-rds
-  - amazonka-redshift
-  - amazonka-rekognition
-  - amazonka-resourcegroups
-  - amazonka-resourcegroupstagging
-  - amazonka-route53
-  - amazonka-route53-autonaming
-  - amazonka-route53-domains
-  - amazonka-s3
-  - amazonka-s3-streaming
-  - amazonka-sagemaker
-  - amazonka-sagemaker-runtime
-  - amazonka-sdb
-  - amazonka-secretsmanager
-  - amazonka-serverlessrepo
-  - amazonka-servicecatalog
-  - amazonka-ses
-  - amazonka-shield
-  - amazonka-sms
-  - amazonka-snowball
-  - amazonka-sns
-  - amazonka-sqs
-  - amazonka-ssm
-  - amazonka-stepfunctions
-  - amazonka-storagegateway
-  - amazonka-sts
-  - amazonka-support
-  - amazonka-swf
-  - amazonka-test
-  - amazonka-transcribe
-  - amazonka-translate
-  - amazonka-waf
-  - amazonka-waf-regional
-  - amazonka-workdocs
-  - amazonka-workmail
-  - amazonka-workspaces
-  - amazonka-xray
   - amby
   - AMI
   - ampersand
@@ -3050,6 +2910,7 @@ broken-packages:
   - antiope-messages
   - antiope-optparse-applicative
   - antiope-s3
+  - antiope-shell
   - antiope-sns
   - antiope-sqs
   - antiope-swf
@@ -3211,7 +3072,6 @@ broken-packages:
   - aws-configuration-tools
   - aws-dynamodb-conduit
   - aws-dynamodb-streams
-  - aws-easy
   - aws-ec2
   - aws-ec2-knownhosts
   - aws-elastic-transcoder
@@ -3227,7 +3087,6 @@ broken-packages:
   - aws-sdk
   - aws-sdk-text-converter
   - aws-sdk-xml-unordered
-  - aws-ses-easy
   - aws-sign4
   - aws-simple
   - aws-sns
@@ -3933,7 +3792,6 @@ broken-packages:
   - conduit-throttle
   - conduit-tokenize-attoparsec
   - conf
-  - confcrypt
   - conffmt
   - confide
   - config-parser
@@ -4503,7 +4361,6 @@ broken-packages:
   - easyplot
   - ebeats
   - ebnf-bff
-  - ec2-unikernel
   - ecma262
   - ecu
   - eddie
@@ -4530,7 +4387,6 @@ broken-packages:
   - Eight-Ball-Pool-Hack-Cheats
   - either-list-functions
   - EitherT
-  - ekg-cloudwatch
   - ekg-elastic
   - ekg-elasticsearch
   - ekg-influxdb
@@ -5381,7 +5237,6 @@ broken-packages:
   - hakismet
   - hakka
   - hako
-  - hakyll
   - hakyll-agda
   - hakyll-blaze-templates
   - hakyll-contrib
@@ -5732,7 +5587,6 @@ broken-packages:
   - heartbeat-streams
   - heatitup
   - heatitup-complete
-  - heavy-logger-amazon
   - hecc
   - heckle
   - hedgehog-checkers
@@ -7971,7 +7825,6 @@ broken-packages:
   - pier-core
   - piet
   - pig
-  - pinboard-notes-backup
   - pinchot
   - ping
   - pinpon
@@ -8758,6 +8611,7 @@ broken-packages:
   - selenium
   - selenium-server
   - selinux
+  - semantic-source
   - Semantique
   - semdoc
   - semi-iso
@@ -8848,7 +8702,6 @@ broken-packages:
   - servant-zeppelin-server
   - servant-zeppelin-swagger
   - server-generic
-  - serverless-haskell
   - serversession-backend-redis
   - serversession-frontend-snap
   - serversession-frontend-yesod
@@ -8905,8 +8758,6 @@ broken-packages:
   - shellish
   - shellmate
   - shellmate-extras
-  - shh
-  - shh-extras
   - shivers-cfg
   - shoap
   - shopify
diff --git a/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix
index d71a1c65a244..d1217ea37df5 100644
--- a/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix
@@ -4407,6 +4407,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Diff_0_4_0" = callPackage
+    ({ mkDerivation, array, base, directory, pretty, process
+     , QuickCheck, test-framework, test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "Diff";
+       version = "0.4.0";
+       sha256 = "1is9y5rlqyxacnj6kbi6h9laym5shp699r0hkj5p9d6qi84sr43j";
+       libraryHaskellDepends = [ array base pretty ];
+       testHaskellDepends = [
+         array base directory pretty process QuickCheck test-framework
+         test-framework-quickcheck2
+       ];
+       description = "O(ND) diff algorithm in haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "DifferenceLogic" = callPackage
     ({ mkDerivation, base, containers, fgl, FirstOrderTheory, HUnit }:
      mkDerivation {
@@ -9085,6 +9103,8 @@ self: {
        pname = "HStringTemplate";
        version = "0.8.7";
        sha256 = "03kbmyh0713j3qhhrl7jqbmsvyq1q82h2yxq45cc9rs55sma8kjg";
+       revision = "1";
+       editedCabalFile = "0s7y606q2q0vnbg9c51kypawyvapva60i2lw1dg1bij50aiv5d3i";
        libraryHaskellDepends = [
          array base blaze-builder bytestring containers deepseq directory
          filepath mtl old-locale parsec pretty semigroups syb
@@ -10617,6 +10637,28 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "HsYAML_0_2_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, deepseq, mtl, parsec
+     , QuickCheck, tasty, tasty-quickcheck, text
+     }:
+     mkDerivation {
+       pname = "HsYAML";
+       version = "0.2.0.0";
+       sha256 = "1x8zrnaqvfkap4q2gldj0y4q63kbjka8383s5k4mb0ka1n3dfqhq";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring containers deepseq mtl parsec text
+       ];
+       testHaskellDepends = [
+         base bytestring containers mtl QuickCheck tasty tasty-quickcheck
+         text
+       ];
+       description = "Pure Haskell YAML 1.2 processor";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "HsYAML-aeson" = callPackage
     ({ mkDerivation, aeson, base, bytestring, HsYAML, mtl, text, vector
      }:
@@ -12711,8 +12753,8 @@ self: {
      }:
      mkDerivation {
        pname = "Map";
-       version = "0.1.1.0";
-       sha256 = "0x5sy115f5yx580g8pl8jkjwzd0ih2n4fbvh5f5ch2i749l4dyq1";
+       version = "0.1.2.0";
+       sha256 = "1fvs9im82ylfij01cn2pb21wycvb6wsj8dayaj34g3av82g9dagw";
        libraryHaskellDepends = [
          base containers either-both filtrable util
        ];
@@ -21140,6 +21182,18 @@ self: {
        broken = true;
      }) {};
 
+  "abides" = callPackage
+    ({ mkDerivation, base, comonad, tasty, tasty-quickcheck }:
+     mkDerivation {
+       pname = "abides";
+       version = "0.0.0";
+       sha256 = "0bksprm776xqxvizmwxaq996kvwj4gvd4ckwalr72aa2082vzs17";
+       libraryHaskellDepends = [ base comonad ];
+       testHaskellDepends = [ base comonad tasty tasty-quickcheck ];
+       description = "Simple boolean tests to see if a value abides by certain properties";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "abnf" = callPackage
     ({ mkDerivation, attoparsec, base, containers, HUnit, megaparsec
      , tasty, tasty-hunit, test-framework, test-framework-hunit, text
@@ -23594,6 +23648,28 @@ self: {
        broken = true;
      }) {};
 
+  "aeson-schemas" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, first-class-families
+     , megaparsec, raw-strings-qq, tasty, tasty-golden, template-haskell
+     , text, th-test-utils, unordered-containers
+     }:
+     mkDerivation {
+       pname = "aeson-schemas";
+       version = "1.0.2";
+       sha256 = "1f75fk4775gri6qvgkcsfx9v7f832zy76z61wl63q8h0yh6lapxl";
+       libraryHaskellDepends = [
+         aeson base bytestring first-class-families megaparsec
+         template-haskell text unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring first-class-families megaparsec
+         raw-strings-qq tasty tasty-golden template-haskell text
+         th-test-utils unordered-containers
+       ];
+       description = "Easily consume JSON data on-demand with type-safety";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "aeson-serialize" = callPackage
     ({ mkDerivation, aeson, base, cereal, hspec, HUnit }:
      mkDerivation {
@@ -25290,8 +25366,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Comprehensive Amazon Web Services SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-alexa-business" = callPackage
@@ -25309,8 +25383,6 @@ self: {
        ];
        description = "Amazon Alexa For Business SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-apigateway" = callPackage
@@ -25328,8 +25400,6 @@ self: {
        ];
        description = "Amazon API Gateway SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-application-autoscaling" = callPackage
@@ -25347,8 +25417,6 @@ self: {
        ];
        description = "Amazon Application Auto Scaling SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-appstream" = callPackage
@@ -25366,8 +25434,6 @@ self: {
        ];
        description = "Amazon AppStream SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-appsync" = callPackage
@@ -25385,8 +25451,6 @@ self: {
        ];
        description = "Amazon AppSync SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-athena" = callPackage
@@ -25404,8 +25468,6 @@ self: {
        ];
        description = "Amazon Athena SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-autoscaling" = callPackage
@@ -25423,8 +25485,6 @@ self: {
        ];
        description = "Amazon Auto Scaling SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-autoscaling-plans" = callPackage
@@ -25442,8 +25502,6 @@ self: {
        ];
        description = "Amazon Auto Scaling Plans SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-batch" = callPackage
@@ -25461,8 +25519,6 @@ self: {
        ];
        description = "Amazon Batch SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-budgets" = callPackage
@@ -25480,8 +25536,6 @@ self: {
        ];
        description = "Amazon Budgets SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-certificatemanager" = callPackage
@@ -25499,8 +25553,6 @@ self: {
        ];
        description = "Amazon Certificate Manager SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-certificatemanager-pca" = callPackage
@@ -25518,8 +25570,6 @@ self: {
        ];
        description = "Amazon Certificate Manager Private Certificate Authority SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-cloud9" = callPackage
@@ -25537,8 +25587,6 @@ self: {
        ];
        description = "Amazon Cloud9 SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-clouddirectory" = callPackage
@@ -25556,8 +25604,6 @@ self: {
        ];
        description = "Amazon CloudDirectory SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-cloudformation" = callPackage
@@ -25575,8 +25621,6 @@ self: {
        ];
        description = "Amazon CloudFormation SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-cloudfront" = callPackage
@@ -25594,8 +25638,6 @@ self: {
        ];
        description = "Amazon CloudFront SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-cloudhsm" = callPackage
@@ -25613,8 +25655,6 @@ self: {
        ];
        description = "Amazon CloudHSM SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-cloudhsmv2" = callPackage
@@ -25632,8 +25672,6 @@ self: {
        ];
        description = "Amazon CloudHSM V2 SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-cloudsearch" = callPackage
@@ -25651,8 +25689,6 @@ self: {
        ];
        description = "Amazon CloudSearch SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-cloudsearch-domains" = callPackage
@@ -25670,8 +25706,6 @@ self: {
        ];
        description = "Amazon CloudSearch Domain SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-cloudtrail" = callPackage
@@ -25689,8 +25723,6 @@ self: {
        ];
        description = "Amazon CloudTrail SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-cloudwatch" = callPackage
@@ -25708,8 +25740,6 @@ self: {
        ];
        description = "Amazon CloudWatch SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-cloudwatch-events" = callPackage
@@ -25727,8 +25757,6 @@ self: {
        ];
        description = "Amazon CloudWatch Events SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-cloudwatch-logs" = callPackage
@@ -25746,8 +25774,6 @@ self: {
        ];
        description = "Amazon CloudWatch Logs SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-codebuild" = callPackage
@@ -25765,8 +25791,6 @@ self: {
        ];
        description = "Amazon CodeBuild SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-codecommit" = callPackage
@@ -25784,8 +25808,6 @@ self: {
        ];
        description = "Amazon CodeCommit SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-codedeploy" = callPackage
@@ -25803,8 +25825,6 @@ self: {
        ];
        description = "Amazon CodeDeploy SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-codepipeline" = callPackage
@@ -25822,8 +25842,6 @@ self: {
        ];
        description = "Amazon CodePipeline SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-codestar" = callPackage
@@ -25841,8 +25859,6 @@ self: {
        ];
        description = "Amazon CodeStar SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-cognito-identity" = callPackage
@@ -25860,8 +25876,6 @@ self: {
        ];
        description = "Amazon Cognito Identity SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-cognito-idp" = callPackage
@@ -25879,8 +25893,6 @@ self: {
        ];
        description = "Amazon Cognito Identity Provider SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-cognito-sync" = callPackage
@@ -25898,8 +25910,6 @@ self: {
        ];
        description = "Amazon Cognito Sync SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-comprehend" = callPackage
@@ -25917,8 +25927,6 @@ self: {
        ];
        description = "Amazon Comprehend SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-config" = callPackage
@@ -25936,8 +25944,6 @@ self: {
        ];
        description = "Amazon Config SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-connect" = callPackage
@@ -25955,8 +25961,6 @@ self: {
        ];
        description = "Amazon Connect Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-core" = callPackage
@@ -25987,8 +25991,6 @@ self: {
        ];
        description = "Core data types and functionality for Amazonka libraries";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-cost-explorer" = callPackage
@@ -26006,8 +26008,6 @@ self: {
        ];
        description = "Amazon Cost Explorer Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-cur" = callPackage
@@ -26025,8 +26025,6 @@ self: {
        ];
        description = "Amazon Cost and Usage Report Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-datapipeline" = callPackage
@@ -26044,8 +26042,6 @@ self: {
        ];
        description = "Amazon Data Pipeline SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-devicefarm" = callPackage
@@ -26063,8 +26059,6 @@ self: {
        ];
        description = "Amazon Device Farm SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-directconnect" = callPackage
@@ -26082,8 +26076,6 @@ self: {
        ];
        description = "Amazon Direct Connect SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-discovery" = callPackage
@@ -26101,8 +26093,6 @@ self: {
        ];
        description = "Amazon Application Discovery Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-dms" = callPackage
@@ -26120,8 +26110,6 @@ self: {
        ];
        description = "Amazon Database Migration Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-ds" = callPackage
@@ -26139,8 +26127,6 @@ self: {
        ];
        description = "Amazon Directory Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-dynamodb" = callPackage
@@ -26158,8 +26144,6 @@ self: {
        ];
        description = "Amazon DynamoDB SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-dynamodb-dax" = callPackage
@@ -26177,8 +26161,6 @@ self: {
        ];
        description = "Amazon DynamoDB Accelerator (DAX) SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-dynamodb-streams" = callPackage
@@ -26196,8 +26178,6 @@ self: {
        ];
        description = "Amazon DynamoDB Streams SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-ec2" = callPackage
@@ -26215,8 +26195,6 @@ self: {
        ];
        description = "Amazon Elastic Compute Cloud SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-ecr" = callPackage
@@ -26234,8 +26212,6 @@ self: {
        ];
        description = "Amazon EC2 Container Registry SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-ecs" = callPackage
@@ -26253,8 +26229,6 @@ self: {
        ];
        description = "Amazon EC2 Container Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-efs" = callPackage
@@ -26272,8 +26246,6 @@ self: {
        ];
        description = "Amazon Elastic File System SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-elasticache" = callPackage
@@ -26291,8 +26263,6 @@ self: {
        ];
        description = "Amazon ElastiCache SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-elasticbeanstalk" = callPackage
@@ -26310,8 +26280,6 @@ self: {
        ];
        description = "Amazon Elastic Beanstalk SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-elasticsearch" = callPackage
@@ -26329,8 +26297,6 @@ self: {
        ];
        description = "Amazon Elasticsearch Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-elastictranscoder" = callPackage
@@ -26348,8 +26314,6 @@ self: {
        ];
        description = "Amazon Elastic Transcoder SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-elb" = callPackage
@@ -26367,8 +26331,6 @@ self: {
        ];
        description = "Amazon Elastic Load Balancing SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-elbv2" = callPackage
@@ -26386,8 +26348,6 @@ self: {
        ];
        description = "Amazon Elastic Load Balancing SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-emr" = callPackage
@@ -26405,8 +26365,6 @@ self: {
        ];
        description = "Amazon Elastic MapReduce SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-fms" = callPackage
@@ -26424,8 +26382,6 @@ self: {
        ];
        description = "Amazon Firewall Management Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-gamelift" = callPackage
@@ -26443,8 +26399,6 @@ self: {
        ];
        description = "Amazon GameLift SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-glacier" = callPackage
@@ -26462,8 +26416,6 @@ self: {
        ];
        description = "Amazon Glacier SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-glue" = callPackage
@@ -26481,8 +26433,6 @@ self: {
        ];
        description = "Amazon Glue SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-greengrass" = callPackage
@@ -26500,8 +26450,6 @@ self: {
        ];
        description = "Amazon Greengrass SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-guardduty" = callPackage
@@ -26519,8 +26467,6 @@ self: {
        ];
        description = "Amazon GuardDuty SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-health" = callPackage
@@ -26538,8 +26484,6 @@ self: {
        ];
        description = "Amazon Health APIs and Notifications SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-iam" = callPackage
@@ -26557,8 +26501,6 @@ self: {
        ];
        description = "Amazon Identity and Access Management SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-iam-policy" = callPackage
@@ -26597,8 +26539,6 @@ self: {
        ];
        description = "Amazon Import/Export SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-inspector" = callPackage
@@ -26616,8 +26556,6 @@ self: {
        ];
        description = "Amazon Inspector SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-iot" = callPackage
@@ -26635,8 +26573,6 @@ self: {
        ];
        description = "Amazon IoT SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-iot-analytics" = callPackage
@@ -26654,8 +26590,6 @@ self: {
        ];
        description = "Amazon IoT Analytics SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-iot-dataplane" = callPackage
@@ -26673,8 +26607,6 @@ self: {
        ];
        description = "Amazon IoT Data Plane SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-iot-jobs-dataplane" = callPackage
@@ -26692,8 +26624,6 @@ self: {
        ];
        description = "Amazon IoT Jobs Data Plane SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-kinesis" = callPackage
@@ -26711,8 +26641,6 @@ self: {
        ];
        description = "Amazon Kinesis SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-kinesis-analytics" = callPackage
@@ -26730,8 +26658,6 @@ self: {
        ];
        description = "Amazon Kinesis Analytics SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-kinesis-firehose" = callPackage
@@ -26749,8 +26675,6 @@ self: {
        ];
        description = "Amazon Kinesis Firehose SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-kinesis-video" = callPackage
@@ -26768,8 +26692,6 @@ self: {
        ];
        description = "Amazon Kinesis Video Streams SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-kinesis-video-archived-media" = callPackage
@@ -26787,8 +26709,6 @@ self: {
        ];
        description = "Amazon Kinesis Video Streams Archived Media SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-kinesis-video-media" = callPackage
@@ -26806,8 +26726,6 @@ self: {
        ];
        description = "Amazon Kinesis Video Streams Media SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-kms" = callPackage
@@ -26825,8 +26743,6 @@ self: {
        ];
        description = "Amazon Key Management Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-lambda" = callPackage
@@ -26844,8 +26760,6 @@ self: {
        ];
        description = "Amazon Lambda SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-lex-models" = callPackage
@@ -26863,8 +26777,6 @@ self: {
        ];
        description = "Amazon Lex Model Building Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-lex-runtime" = callPackage
@@ -26882,8 +26794,6 @@ self: {
        ];
        description = "Amazon Lex Runtime Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-lightsail" = callPackage
@@ -26901,8 +26811,6 @@ self: {
        ];
        description = "Amazon Lightsail SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-marketplace-analytics" = callPackage
@@ -26920,8 +26828,6 @@ self: {
        ];
        description = "Amazon Marketplace Commerce Analytics SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-marketplace-entitlement" = callPackage
@@ -26939,8 +26845,6 @@ self: {
        ];
        description = "Amazon Marketplace Entitlement Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-marketplace-metering" = callPackage
@@ -26958,8 +26862,6 @@ self: {
        ];
        description = "Amazon Marketplace Metering SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-mechanicalturk" = callPackage
@@ -26977,8 +26879,6 @@ self: {
        ];
        description = "Amazon Mechanical Turk SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-mediaconvert" = callPackage
@@ -26996,8 +26896,6 @@ self: {
        ];
        description = "Amazon Elemental MediaConvert SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-medialive" = callPackage
@@ -27015,8 +26913,6 @@ self: {
        ];
        description = "Amazon Elemental MediaLive SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-mediapackage" = callPackage
@@ -27034,8 +26930,6 @@ self: {
        ];
        description = "Amazon Elemental MediaPackage SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-mediastore" = callPackage
@@ -27053,8 +26947,6 @@ self: {
        ];
        description = "Amazon Elemental MediaStore SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-mediastore-dataplane" = callPackage
@@ -27072,8 +26964,6 @@ self: {
        ];
        description = "Amazon Elemental MediaStore Data Plane SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-migrationhub" = callPackage
@@ -27091,8 +26981,6 @@ self: {
        ];
        description = "Amazon Migration Hub SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-ml" = callPackage
@@ -27110,8 +26998,6 @@ self: {
        ];
        description = "Amazon Machine Learning SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-mobile" = callPackage
@@ -27129,8 +27015,6 @@ self: {
        ];
        description = "Amazon Mobile SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-mq" = callPackage
@@ -27148,8 +27032,6 @@ self: {
        ];
        description = "Amazon MQ SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-opsworks" = callPackage
@@ -27167,8 +27049,6 @@ self: {
        ];
        description = "Amazon OpsWorks SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-opsworks-cm" = callPackage
@@ -27186,8 +27066,6 @@ self: {
        ];
        description = "Amazon OpsWorks for Chef Automate SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-organizations" = callPackage
@@ -27205,8 +27083,6 @@ self: {
        ];
        description = "Amazon Organizations SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-pinpoint" = callPackage
@@ -27224,8 +27100,6 @@ self: {
        ];
        description = "Amazon Pinpoint SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-polly" = callPackage
@@ -27243,8 +27117,6 @@ self: {
        ];
        description = "Amazon Polly SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-pricing" = callPackage
@@ -27262,8 +27134,6 @@ self: {
        ];
        description = "Amazon Price List Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-rds" = callPackage
@@ -27281,8 +27151,6 @@ self: {
        ];
        description = "Amazon Relational Database Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-redshift" = callPackage
@@ -27300,8 +27168,6 @@ self: {
        ];
        description = "Amazon Redshift SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-rekognition" = callPackage
@@ -27319,8 +27185,6 @@ self: {
        ];
        description = "Amazon Rekognition SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-resourcegroups" = callPackage
@@ -27338,8 +27202,6 @@ self: {
        ];
        description = "Amazon Resource Groups SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-resourcegroupstagging" = callPackage
@@ -27357,8 +27219,6 @@ self: {
        ];
        description = "Amazon Resource Groups Tagging API SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-route53" = callPackage
@@ -27376,8 +27236,6 @@ self: {
        ];
        description = "Amazon Route 53 SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-route53-autonaming" = callPackage
@@ -27395,8 +27253,6 @@ self: {
        ];
        description = "Amazon Route 53 Auto Naming SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-route53-domains" = callPackage
@@ -27414,8 +27270,6 @@ self: {
        ];
        description = "Amazon Route 53 Domains SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-s3" = callPackage
@@ -27433,8 +27287,6 @@ self: {
        ];
        description = "Amazon Simple Storage Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-s3-streaming" = callPackage
@@ -27454,8 +27306,6 @@ self: {
        ];
        description = "Provides conduits to upload data to S3 using the Multipart API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-sagemaker" = callPackage
@@ -27473,8 +27323,6 @@ self: {
        ];
        description = "Amazon SageMaker Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-sagemaker-runtime" = callPackage
@@ -27492,8 +27340,6 @@ self: {
        ];
        description = "Amazon SageMaker Runtime SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-sdb" = callPackage
@@ -27511,8 +27357,6 @@ self: {
        ];
        description = "Amazon SimpleDB SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-secretsmanager" = callPackage
@@ -27530,8 +27374,6 @@ self: {
        ];
        description = "Amazon Secrets Manager SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-serverlessrepo" = callPackage
@@ -27549,8 +27391,6 @@ self: {
        ];
        description = "Amazon ServerlessApplicationRepository SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-servicecatalog" = callPackage
@@ -27568,8 +27408,6 @@ self: {
        ];
        description = "Amazon Service Catalog SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-ses" = callPackage
@@ -27587,8 +27425,6 @@ self: {
        ];
        description = "Amazon Simple Email Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-shield" = callPackage
@@ -27606,8 +27442,6 @@ self: {
        ];
        description = "Amazon Shield SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-sms" = callPackage
@@ -27625,8 +27459,6 @@ self: {
        ];
        description = "Amazon Server Migration Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-snowball" = callPackage
@@ -27644,8 +27476,6 @@ self: {
        ];
        description = "Amazon Import/Export Snowball SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-sns" = callPackage
@@ -27663,8 +27493,6 @@ self: {
        ];
        description = "Amazon Simple Notification Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-sqs" = callPackage
@@ -27682,8 +27510,6 @@ self: {
        ];
        description = "Amazon Simple Queue Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-ssm" = callPackage
@@ -27701,8 +27527,6 @@ self: {
        ];
        description = "Amazon Simple Systems Manager (SSM) SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-stepfunctions" = callPackage
@@ -27720,8 +27544,6 @@ self: {
        ];
        description = "Amazon Step Functions SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-storagegateway" = callPackage
@@ -27739,8 +27561,6 @@ self: {
        ];
        description = "Amazon Storage Gateway SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-sts" = callPackage
@@ -27758,8 +27578,6 @@ self: {
        ];
        description = "Amazon Security Token Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-support" = callPackage
@@ -27777,8 +27595,6 @@ self: {
        ];
        description = "Amazon Support SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-swf" = callPackage
@@ -27796,8 +27612,6 @@ self: {
        ];
        description = "Amazon Simple Workflow Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-test" = callPackage
@@ -27819,8 +27633,6 @@ self: {
        ];
        description = "Common functionality for Amazonka library test-suites";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-transcribe" = callPackage
@@ -27838,8 +27650,6 @@ self: {
        ];
        description = "Amazon Transcribe Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-translate" = callPackage
@@ -27857,8 +27667,6 @@ self: {
        ];
        description = "Amazon Translate SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-waf" = callPackage
@@ -27876,8 +27684,6 @@ self: {
        ];
        description = "Amazon WAF SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-waf-regional" = callPackage
@@ -27895,8 +27701,6 @@ self: {
        ];
        description = "Amazon WAF Regional SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-workdocs" = callPackage
@@ -27914,8 +27718,6 @@ self: {
        ];
        description = "Amazon WorkDocs SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-workmail" = callPackage
@@ -27933,8 +27735,6 @@ self: {
        ];
        description = "Amazon WorkMail SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-workspaces" = callPackage
@@ -27952,8 +27752,6 @@ self: {
        ];
        description = "Amazon WorkSpaces SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-xray" = callPackage
@@ -27971,8 +27769,6 @@ self: {
        ];
        description = "Amazon X-Ray SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amby" = callPackage
@@ -28854,8 +28650,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-athena";
-       version = "7.3.4";
-       sha256 = "1d4pm1fb8iwfhb2f57n6kkzm27nj9fqgn3m14zzdbxk2l63q41h3";
+       version = "7.4.2";
+       sha256 = "0mbxg2d5hwd7v17wdqdg61rkhag30pvp84a12bwhjr5ijqhfwbf8";
        libraryHaskellDepends = [
          amazonka amazonka-athena amazonka-core base lens resourcet text
          unliftio-core
@@ -28875,8 +28671,8 @@ self: {
     ({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }:
      mkDerivation {
        pname = "antiope-contract";
-       version = "7.3.4";
-       sha256 = "0006g261khirldmsbnggnb9fmn9z6m9j7hi9cggpgmxc5ird16p6";
+       version = "7.4.2";
+       sha256 = "0p5lahs7vmah0ww87wxrd7pp579zijyb9n2wh4mys8i0qiqq7fq0";
        libraryHaskellDepends = [
          aeson antiope-s3 avro base bytestring text
        ];
@@ -28894,8 +28690,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-core";
-       version = "7.3.4";
-       sha256 = "07zf2a0vpzcn5f9rr0k13w2pljybb8glc149wymhkjjfhhgb2ylh";
+       version = "7.4.2";
+       sha256 = "13s6shrhm2d17dialmpyi40vrdq5qw1zy960hl0g8d1fyg954ipx";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core base bytestring exceptions
          generic-lens http-client http-types lens mtl resourcet text
@@ -28921,8 +28717,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-dynamodb";
-       version = "7.3.4";
-       sha256 = "0smsb7s7ymsdhkvawlbv9j67i1vr9i58qad9m4d5ir43pxi1bmvh";
+       version = "7.4.2";
+       sha256 = "1wmxq228wr18j4qpxqhrnv8y3yzhy3gpa1daa2zbq5zflbkxjcvf";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-dynamodb antiope-core base
          generic-lens lens text unliftio-core unordered-containers
@@ -28946,8 +28742,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-messages";
-       version = "7.3.4";
-       sha256 = "0n9s18fmqp22r857yybd3ddm5m6ijr0a1vydll9qqaia951s2a6a";
+       version = "7.4.2";
+       sha256 = "0xlzz9dr06s03pqfra8agy80a3r8593kjcfs0w7b1v6m0ahwi9ip";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core base bytestring generic-lens lens
          lens-aeson monad-loops network-uri text unliftio-core
@@ -28971,8 +28767,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-optparse-applicative";
-       version = "7.3.4";
-       sha256 = "1l21xgis1rzzbziz403wl4inilnn52ly4w1lp1cbcj7hnykaxa1i";
+       version = "7.4.2";
+       sha256 = "0nvmv0db1v0iw446cy2hfczpsll2if3w0cjmhgr5zgj9l5ja9x1c";
        libraryHaskellDepends = [
          amazonka amazonka-core amazonka-s3 base optparse-applicative text
        ];
@@ -28996,8 +28792,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-s3";
-       version = "7.3.4";
-       sha256 = "14k5w7s30rqygf6df309h90p9d5fgvw9wxwgz0sisi1mzvbb7wry";
+       version = "7.4.2";
+       sha256 = "1gpsc6y18h63wwkawvzwz8qmpw21pqhgpvgnb7apl9jc06xp2v0h";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-s3 antiope-core
          antiope-messages attoparsec base bytestring conduit conduit-extra
@@ -29017,6 +28813,37 @@ self: {
        broken = true;
      }) {};
 
+  "antiope-shell" = callPackage
+    ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3
+     , antiope-core, antiope-messages, antiope-s3, attoparsec, base
+     , bytestring, conduit, conduit-extra, exceptions, generic-lens
+     , hedgehog, hspec, hspec-discover, http-types, hw-hspec-hedgehog
+     , lens, mtl, network-uri, process, resourcet, text, time
+     , unliftio-core
+     }:
+     mkDerivation {
+       pname = "antiope-shell";
+       version = "7.4.2";
+       sha256 = "1xg98dg52qmp8sz2r4b0srh7kasvd411i6wl3cj9m3nngignbab8";
+       libraryHaskellDepends = [
+         aeson amazonka amazonka-core amazonka-s3 antiope-core
+         antiope-messages antiope-s3 attoparsec base bytestring exceptions
+         generic-lens http-types lens mtl network-uri process resourcet text
+         time unliftio-core
+       ];
+       testHaskellDepends = [
+         aeson amazonka amazonka-core amazonka-s3 antiope-core attoparsec
+         base bytestring conduit conduit-extra exceptions generic-lens
+         hedgehog hspec http-types hw-hspec-hedgehog lens mtl network-uri
+         resourcet text time unliftio-core
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "antiope-sns" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sns, base
      , bytestring, generic-lens, hedgehog, hspec, hspec-discover
@@ -29024,8 +28851,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-sns";
-       version = "7.3.4";
-       sha256 = "0vcns4p0agni4afdw4cr3hz2xq54d3wam6mkaggd5zyf974x7c7c";
+       version = "7.4.2";
+       sha256 = "09g6jsdi20xa43ipb31y5i3afn75gldm0xyr2mqkfyhb8ay6simx";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-sns base bytestring
          generic-lens lens text time unliftio-core
@@ -29051,8 +28878,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-sqs";
-       version = "7.3.4";
-       sha256 = "1y1kgppnc47wprd3sjw8qbjh5dvfr4i7mczi70s88i8apkqlxrbn";
+       version = "7.4.2";
+       sha256 = "044sa2skvbr492bal52ncbsybr9wrkkq5kcvsdaiqwvkpfwq66v0";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-sqs base bytestring conduit
          generic-lens lens lens-aeson monad-loops mtl network-uri split text
@@ -29076,8 +28903,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-swf";
-       version = "7.3.4";
-       sha256 = "1rn31vdjfs7jrx87a44vg36kwkcxx7sp3mx54f494srwa3cv1di5";
+       version = "7.4.2";
+       sha256 = "1zp63q8dd400ll6cl9wsp6rhghzm56rsak8sh5p860adlk49y9il";
        libraryHaskellDepends = [ amazonka-swf base lens text ];
        testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ];
        testToolDepends = [ hspec-discover ];
@@ -32672,12 +32499,13 @@ self: {
      , dependency, dhall, directory, file-embed, filemanip, filepath
      , http-client, http-client-tls, lzma, microlens, mtl
      , optparse-applicative, parallel-io, process, shake, shake-ats
-     , shake-c, shake-ext, tar, temporary, text, unix, zip-archive, zlib
+     , shake-c, shake-ext, tar, temporary, text, unix, unix-compat
+     , zip-archive, zlib
      }:
      mkDerivation {
        pname = "ats-pkg";
-       version = "3.2.5.18";
-       sha256 = "16v3308zap5jhpd9xsvjdgp28330iscaikdl76jqf5jhb175pxzr";
+       version = "3.2.6.0";
+       sha256 = "1jxs3rfv9nrigwnshanc90dm3nzimr7zmfln1la5nv098prdkakr";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -32686,7 +32514,7 @@ self: {
          composition-prelude containers dependency dhall directory
          file-embed filemanip filepath http-client http-client-tls lzma
          microlens mtl parallel-io process shake shake-ats shake-c shake-ext
-         tar text unix zip-archive zlib
+         tar text unix unix-compat zip-archive zlib
        ];
        libraryToolDepends = [ cpphs ];
        executableHaskellDepends = [
@@ -34109,8 +33937,6 @@ self: {
        ];
        description = "Helper function and types for working with amazonka";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-ec2" = callPackage
@@ -34536,8 +34362,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Wrapper over Amazonka's SES";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-sign4" = callPackage
@@ -37843,8 +37667,8 @@ self: {
        pname = "binary-orphans";
        version = "1.0.1";
        sha256 = "0gbmn5rpvyxhw5bxjmxwld6918lslv03b2f6hshssaw1il5x86j3";
-       revision = "1";
-       editedCabalFile = "0sww1904gn3sxvj94ac8l1g50v0j3fgpfiynbpvg0yhqsbfazi3n";
+       revision = "2";
+       editedCabalFile = "0b4fafgwhrp4i7vxcynzk5678kn6jvraanmbmf14mxlkipl2fff3";
        libraryHaskellDepends = [ base binary transformers ];
        testHaskellDepends = [
          base binary QuickCheck quickcheck-instances tagged tasty
@@ -45137,6 +44961,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cabal-flatpak" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cabal-plan
+     , containers, http-client, http-client-tls, http-types
+     , optparse-applicative, pathtype, shell-utility, text, utility-ht
+     }:
+     mkDerivation {
+       pname = "cabal-flatpak";
+       version = "0.0";
+       sha256 = "0ci55nzlp1hqx31m7pw37ms8pb053gb85126pszpsd8n7yvlra9w";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson aeson-pretty base bytestring cabal-plan containers
+         http-client http-client-tls http-types optparse-applicative
+         pathtype shell-utility text utility-ht
+       ];
+       description = "Generate a FlatPak manifest from a Cabal package description";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "cabal-fmt" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, directory
      , filepath, mtl, optparse-applicative, parsec, pretty, process
@@ -52911,8 +52755,8 @@ self: {
        pname = "co-log";
        version = "0.3.0.0";
        sha256 = "0rrxgc3qs10lj94d0v42fd6979znvmzxd7dmffp2lxpzmnymnsha";
-       revision = "2";
-       editedCabalFile = "12h6rgqgqd1wcm2ahl6b3wglsgq4ynjacrz9m0wkyry3k0jwzd8f";
+       revision = "3";
+       editedCabalFile = "0z2456b49k0qfd4fzvbwndvdvnwfvsmhyxd5gmbiz7l7b458dq3s";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -53841,18 +53685,17 @@ self: {
      }) {};
 
   "colour-space" = callPackage
-    ({ mkDerivation, base, colour, constrained-categories, JuicyPixels
-     , linear, linearmap-category, manifolds, semigroups, vector-space
+    ({ mkDerivation, base, call-stack, colour, constrained-categories
+     , JuicyPixels, lens, linear, linearmap-category, manifolds
+     , semigroups, vector-space
      }:
      mkDerivation {
        pname = "colour-space";
-       version = "0.1.4.0";
-       sha256 = "0sr341chqhngm7ihyy3ym3w345sk101gznw80iksjwxjg3iiqxmq";
-       revision = "2";
-       editedCabalFile = "0qldxm84rk344h4wgk3bqsxfhkmvj8psm0sqgfnjh34a4fy5hjzg";
+       version = "0.1.5.0";
+       sha256 = "13xmn8l11r06xna575sw6sdhp2rj25q8qd9ljbjpl37fr1qbc8xs";
        libraryHaskellDepends = [
-         base colour constrained-categories JuicyPixels linear
-         linearmap-category manifolds semigroups vector-space
+         base call-stack colour constrained-categories JuicyPixels lens
+         linear linearmap-category manifolds semigroups vector-space
        ];
        description = "Instances of the manifold-classes for colour types";
        license = stdenv.lib.licenses.gpl3;
@@ -55952,6 +55795,42 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "conduit-algorithms_0_0_11_0" = callPackage
+    ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit
+     , conduit-combinators, conduit-extra, conduit-zstd, containers
+     , criterion, deepseq, directory, exceptions, HUnit, lzma-conduit
+     , monad-control, mtl, pqueue, resourcet, stm, stm-conduit
+     , streaming-commons, test-framework, test-framework-hunit
+     , test-framework-th, transformers, unliftio-core, vector
+     }:
+     mkDerivation {
+       pname = "conduit-algorithms";
+       version = "0.0.11.0";
+       sha256 = "0c1jwz30kkvimx7lb61782yk0kyfamrf5bqc3g1h7g51lk8bbv9i";
+       libraryHaskellDepends = [
+         async base bytestring bzlib-conduit conduit conduit-combinators
+         conduit-extra conduit-zstd containers deepseq exceptions
+         lzma-conduit monad-control mtl pqueue resourcet stm stm-conduit
+         streaming-commons transformers unliftio-core vector
+       ];
+       testHaskellDepends = [
+         async base bytestring bzlib-conduit conduit conduit-combinators
+         conduit-extra conduit-zstd containers deepseq directory exceptions
+         HUnit lzma-conduit monad-control mtl pqueue resourcet stm
+         stm-conduit streaming-commons test-framework test-framework-hunit
+         test-framework-th transformers unliftio-core vector
+       ];
+       benchmarkHaskellDepends = [
+         async base bytestring bzlib-conduit conduit conduit-combinators
+         conduit-extra conduit-zstd containers criterion deepseq exceptions
+         lzma-conduit monad-control mtl pqueue resourcet stm stm-conduit
+         streaming-commons transformers unliftio-core vector
+       ];
+       description = "Conduit-based algorithms";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "conduit-audio" = callPackage
     ({ mkDerivation, base, conduit, vector }:
      mkDerivation {
@@ -56439,8 +56318,6 @@ self: {
          text transformers
        ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "conferer" = callPackage
@@ -56449,8 +56326,8 @@ self: {
      }:
      mkDerivation {
        pname = "conferer";
-       version = "0.1.0.1";
-       sha256 = "1g5kyvy067lll181xqd1lxpzl5965yj847kh6z2r0wvq01i4k467";
+       version = "0.1.0.4";
+       sha256 = "0zzc6m52a3rsd6cs7ns95rk1bl1gf9dyrz7lx0kakibxpb11sgsy";
        libraryHaskellDepends = [
          base bytestring containers directory text
        ];
@@ -56461,6 +56338,71 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "conferer-hspec" = callPackage
+    ({ mkDerivation, base, conferer, hspec, hspec-core, text }:
+     mkDerivation {
+       pname = "conferer-hspec";
+       version = "0.1.0.1";
+       sha256 = "1wjn4my0grb62vkswvxa4674s0fid6kskvxz1qll14gqw6wlkx19";
+       libraryHaskellDepends = [ base conferer hspec-core text ];
+       testHaskellDepends = [ base conferer hspec hspec-core text ];
+       description = "conferer's FromConfig instances for hspec Config";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "conferer-provider-json" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, conferer, directory
+     , hspec, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "conferer-provider-json";
+       version = "0.1.0.2";
+       sha256 = "1iww8w6d7710b58yqiap10jkbgb08ah3szc259p7wn4lnv96cic0";
+       libraryHaskellDepends = [
+         aeson base bytestring conferer directory text unordered-containers
+         vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring conferer directory hspec text
+         unordered-containers vector
+       ];
+       description = "Configuration for reading json files";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "conferer-snap" = callPackage
+    ({ mkDerivation, base, conferer, hspec, snap-core, snap-server
+     , text
+     }:
+     mkDerivation {
+       pname = "conferer-snap";
+       version = "0.1.0.3";
+       sha256 = "07x1grjqq5dsz7w8vrkzdaknfvqkvjqkmjwjiixn51jxfg6011zq";
+       libraryHaskellDepends = [
+         base conferer snap-core snap-server text
+       ];
+       testHaskellDepends = [
+         base conferer hspec snap-core snap-server text
+       ];
+       description = "conferer's FromConfig instances for snap Config";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "conferer-warp" = callPackage
+    ({ mkDerivation, base, conferer, hspec, http-types, text, wai, warp
+     }:
+     mkDerivation {
+       pname = "conferer-warp";
+       version = "0.1.0.1";
+       sha256 = "1alzbcm4bkp2a5p53b3vpnl0zgnz8bm2rpn2aljs24wz3vapgzsa";
+       libraryHaskellDepends = [ base conferer http-types text wai warp ];
+       testHaskellDepends = [
+         base conferer hspec http-types text wai warp
+       ];
+       description = "conferer's FromConfig instances for warp settings";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "confetti" = callPackage
     ({ mkDerivation, base, cmdargs, directory, filepath, MissingH
      , tasty, tasty-hunit, tasty-smallcheck, text, time, unix, yaml
@@ -57734,7 +57676,7 @@ self: {
        version = "0.1.0.1";
        sha256 = "0rwi5zwvqn18g7qyp9aw51w3yzkqbff9g7rcqdk1l871fvq8qhha";
        libraryHaskellDepends = [ base ];
-       description = "Haskell operator `g ... f = \x1 .. xn -> g (f x1 .. xn)`.";
+       description = "Haskell operator `g ... f = \\x1 .. xn -> g (f x1 .. xn)`.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -58938,6 +58880,8 @@ self: {
        pname = "cpkg";
        version = "0.2.3.2";
        sha256 = "0dwcahc8m2mj3jm0hwx13wzhlnyiby4sds8pc70fv54zp0ccbq6r";
+       revision = "1";
+       editedCabalFile = "1c38aadl6lfnid8ipmpvm78mlvb0rgqr5sdjg86y1ks4q45nqw3g";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -70811,8 +70755,8 @@ self: {
      }:
      mkDerivation {
        pname = "distribution-nixpkgs";
-       version = "1.2";
-       sha256 = "0123plf001136q5gd9brq6vhpnx7db6gixx5sagp5l8jd2qpb244";
+       version = "1.3.0";
+       sha256 = "192r9aizcjvnm0s57v056x42mvlq79fk8630g73ps6qqnb2mjy9h";
        libraryHaskellDepends = [
          aeson base bytestring Cabal containers deepseq language-nix lens
          pretty process split
@@ -71071,6 +71015,8 @@ self: {
        pname = "dl-fedora";
        version = "0.7";
        sha256 = "00fkjlggax5l9qk2dlgh3plkqrvxrwfipdcfpq8d5kfw7l5wdxsv";
+       revision = "1";
+       editedCabalFile = "1njib3nnknqpa4kmrrrfabkrh1iaqx8xsw7jn4qrhlnqhh0mqwqd";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -74237,8 +74183,6 @@ self: {
        ];
        description = "A handy tool for uploading unikernels to Amazon's EC2";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "eccrypto" = callPackage
@@ -75105,8 +75049,6 @@ self: {
        ];
        description = "An ekg backend for Amazon Cloudwatch";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ekg-core" = callPackage
@@ -79341,8 +79283,8 @@ self: {
      }:
      mkDerivation {
        pname = "exhaustive";
-       version = "1.1.7";
-       sha256 = "02kv3vv7gz8lqwm5iz4nddyzxp17cgsb6j12lc5kf51l481vpb1z";
+       version = "1.1.8";
+       sha256 = "1nnylpjrrb6smmgl3d481wpkxpdw26yfa3jlw98p3xgm8k907486";
        libraryHaskellDepends = [
          base generics-sop template-haskell transformers
        ];
@@ -81634,10 +81576,8 @@ self: {
      }:
      mkDerivation {
        pname = "fcm-client";
-       version = "0.1.0.0";
-       sha256 = "1qv43pfwgi7d7bx445z3q3zr7szv6y7ky9gb6g7f1chxs4q6mcdl";
-       revision = "1";
-       editedCabalFile = "1rvb99gh2m1j2bd9x6vc58kvkwdcxl5wwypvnj3c62zcqmdln03l";
+       version = "0.2.0.0";
+       sha256 = "151lm6g08bwqfdi25zmsv99wri8x75fi1svwsgm2ar2hd8zjngnj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -83353,8 +83293,8 @@ self: {
      }:
      mkDerivation {
        pname = "finitary";
-       version = "1.0.0.1";
-       sha256 = "1va895ijk7sb5zn6zf1bfi8w0bqxjx4631iwnijh9f4d3dsnpqcv";
+       version = "1.1.0.1";
+       sha256 = "13rvwymzsl91zwvc565ysakn8lznwwfnrg0d4vxvlqqrrkbkca1p";
        libraryHaskellDepends = [
          base bitvec coercible-utils finite-typelits ghc-typelits-knownnat
          ghc-typelits-natnormalise mtl primitive template-haskell
@@ -83375,8 +83315,8 @@ self: {
      }:
      mkDerivation {
        pname = "finitary-derive";
-       version = "1.0.0.0";
-       sha256 = "0ns61aylidrkdf4qkfz1r1vjfzlmgbqar1dq068xg1pvnkpsrvlc";
+       version = "1.0.0.1";
+       sha256 = "1wv9jjvv1jd5y39pybfawb19pxzwb6r3p69ajyh2f7m8nn81kcim";
        libraryHaskellDepends = [
          base binary coercible-utils deepseq finitary finite-typelits
          ghc-typelits-extra ghc-typelits-knownnat hashable mtl vector
@@ -88749,6 +88689,22 @@ self: {
        license = "GPL";
      }) {};
 
+  "fvars" = callPackage
+    ({ mkDerivation, async, base, exceptions, hspec, monad-control, mtl
+     , transformers
+     }:
+     mkDerivation {
+       pname = "fvars";
+       version = "1.0.0.0";
+       sha256 = "0iwlmr388wv98n244wdzwk5l7j6p669pq3vwavpnk37wfanahvxj";
+       libraryHaskellDepends = [
+         base exceptions monad-control mtl transformers
+       ];
+       testHaskellDepends = [ async base hspec ];
+       description = "Fast Mutable Vars";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "fwgl" = callPackage
     ({ mkDerivation, base, hashable, transformers, unordered-containers
      , vect, vector, Yampa
@@ -92806,8 +92762,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghcide";
-       version = "0.0.2";
-       sha256 = "0ivq4j4i7cb8k7h2rkc9kpki39zl1nc63ba6hpfdlyl5vg5x3qy7";
+       version = "0.0.3";
+       sha256 = "0czmgw2wfsycxs3lbs838xmgdvk52ry0dnb0dgxmafqgdi0l7xi3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -92823,7 +92779,7 @@ self: {
          haskell-lsp hie-bios optparse-applicative shake text
        ];
        testHaskellDepends = [
-         base containers extra filepath haskell-lsp-types lens lsp-test
+         base containers extra filepath ghc haskell-lsp-types lens lsp-test
          parser-combinators tasty tasty-hunit text
        ];
        description = "The core of an IDE";
@@ -95211,6 +95167,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "github-webhooks_0_11_0" = callPackage
+    ({ mkDerivation, aeson, base, base16-bytestring, bytestring
+     , cryptonite, deepseq, deepseq-generics, hspec, memory, text, time
+     , vector
+     }:
+     mkDerivation {
+       pname = "github-webhooks";
+       version = "0.11.0";
+       sha256 = "1x9vwx7k8xyblfxqny7almqlzzncnm315x6dq6y2bzsl9sxwvnkg";
+       libraryHaskellDepends = [
+         aeson base base16-bytestring bytestring cryptonite deepseq
+         deepseq-generics memory text time vector
+       ];
+       testHaskellDepends = [ aeson base bytestring hspec text vector ];
+       description = "Aeson instances for GitHub Webhook payloads";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "githud" = callPackage
     ({ mkDerivation, base, bytestring, daemons, data-default, directory
      , mtl, network, parsec, process, tasty, tasty-hunit
@@ -100047,14 +100022,14 @@ self: {
 
   "grammatical-parsers" = callPackage
     ({ mkDerivation, base, checkers, containers, criterion, deepseq
-     , doctest, monoid-subclasses, parsers, QuickCheck, rank2classes
-     , size-based, tasty, tasty-quickcheck, testing-feat, text
-     , transformers
+     , doctest, markdown-unlit, monoid-subclasses, parsers, QuickCheck
+     , rank2classes, size-based, tasty, tasty-quickcheck, testing-feat
+     , text, transformers
      }:
      mkDerivation {
        pname = "grammatical-parsers";
-       version = "0.4";
-       sha256 = "0cn912rq65k234y12wwbh07wfps107i43s374lddajb853jq3wr6";
+       version = "0.4.0.1";
+       sha256 = "049xz8gscqxn5k5vy34zc97w4in4scv89jvd71kxf24yvxblzayz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -100068,6 +100043,7 @@ self: {
          QuickCheck rank2classes size-based tasty tasty-quickcheck
          testing-feat
        ];
+       testToolDepends = [ markdown-unlit ];
        benchmarkHaskellDepends = [
          base containers criterion deepseq monoid-subclasses parsers
          rank2classes text
@@ -103598,6 +103574,8 @@ self: {
        pname = "hackage-db";
        version = "2.0.1";
        sha256 = "13ggj72i8dxwh3qwznnqxbr00nvsbapyyhzx5zybfacddnpw3aph";
+       revision = "1";
+       editedCabalFile = "0l2zdajacqibwkjs5pif6a3mxns9jpc6iry7xxqcfis4n9ks404a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -103609,6 +103587,28 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
+  "hackage-db_2_1_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, Cabal, containers
+     , directory, exceptions, filepath, tar, time, utf8-string
+     }:
+     mkDerivation {
+       pname = "hackage-db";
+       version = "2.1.0";
+       sha256 = "1vsc0lrbrb525frycqq0c5z846whymgcjl888gnlqd16nknbsn3l";
+       revision = "1";
+       editedCabalFile = "1h3x5a8xmqkkcd3h1m7z0il1vbsh2c77685y68zmyp21zb1y88hy";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring Cabal containers directory exceptions
+         filepath tar time utf8-string
+       ];
+       description = "Access cabal-install's Hackage database via Data.Map";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ peti ];
+     }) {};
+
   "hackage-diff" = callPackage
     ({ mkDerivation, ansi-terminal, async, attoparsec, base, Cabal
      , cpphs, directory, filepath, haskell-src-exts, HTTP, mtl, process
@@ -104803,8 +104803,6 @@ self: {
        testToolDepends = [ utillinux ];
        description = "A static website compiler library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) utillinux;};
 
   "hakyll-R" = callPackage
@@ -107057,8 +107055,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasbolt-extras";
-       version = "0.0.0.21";
-       sha256 = "1fq96j9hrfvjffjqz938fql40h15mb7dhfzjfbryd5qip4k45435";
+       version = "0.0.0.22";
+       sha256 = "06bad2hbzmrrav1f7fsszrspxghziy6jpmgr39nbs375fbqib4kp";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -110977,8 +110975,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskseg";
-       version = "0.1.0.1";
-       sha256 = "0m9226wwkkvfqr2nfhf2gxymav3fp6klvzilsrkx502dqlll25qc";
+       version = "0.1.0.2";
+       sha256 = "0p9z71gbrgssjs1zgbjfqn2g4k4i6ahs9lj1x82mjqppvc4gr0n3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -113778,8 +113776,6 @@ self: {
        ];
        description = "heavy-logger compatibility with amazonka-core logging";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "heavy-logger-instances" = callPackage
@@ -113849,6 +113845,35 @@ self: {
        broken = true;
      }) {};
 
+  "hedgehog_0_6_1" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, bytestring
+     , concurrent-output, containers, directory, exceptions
+     , lifted-async, mmorph, monad-control, mtl, pretty-show, primitive
+     , random, resourcet, semigroups, stm, template-haskell, text
+     , th-lift, time, transformers, transformers-base, unix
+     , wl-pprint-annotated
+     }:
+     mkDerivation {
+       pname = "hedgehog";
+       version = "0.6.1";
+       sha256 = "0xz10ycdm5vk9nrcym1fi83k19frfwqz18bz8bnpzwvaj0j41yfj";
+       revision = "5";
+       editedCabalFile = "0kwmxjb1y3gk85njacw5wcvmq3bzp1649dbjzgzpiba2w342f7il";
+       libraryHaskellDepends = [
+         ansi-terminal async base bytestring concurrent-output containers
+         directory exceptions lifted-async mmorph monad-control mtl
+         pretty-show primitive random resourcet semigroups stm
+         template-haskell text th-lift time transformers transformers-base
+         unix wl-pprint-annotated
+       ];
+       testHaskellDepends = [
+         base containers pretty-show semigroups text transformers
+       ];
+       description = "Hedgehog will eat all your bugs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hedgehog" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, bytestring
      , concurrent-output, containers, directory, exceptions, fail
@@ -116370,8 +116395,8 @@ self: {
      }:
      mkDerivation {
        pname = "hie-bios";
-       version = "0.2.0";
-       sha256 = "0sr0drw0kyf4f77cg25x4scjzqg597yr5xl4dzqdnjz5vv0p1znm";
+       version = "0.2.1";
+       sha256 = "12gqchrqscf7qnmid3k8wizxax4157dggg6kr1dipbwn36dczhrv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -119836,8 +119861,8 @@ self: {
        pname = "hoist-error";
        version = "0.2.1.0";
        sha256 = "028lczd80nhj3yj5dq9qixzdzkyisl34qpi6bb28r8b9nj2i2nss";
-       revision = "1";
-       editedCabalFile = "0abzpyxr46kk9vh5yxy8wawmyn1x1zrhl9mdxwfz0s938z4s7nr5";
+       revision = "2";
+       editedCabalFile = "1wk9a58ychqfabbrh8zdzzd7cfvwgf8xyfi6ynsckh1yb5xa4f7j";
        libraryHaskellDepends = [ base either mtl ];
        description = "Some convenience facilities for hoisting errors into a monad";
        license = stdenv.lib.licenses.mit;
@@ -122449,8 +122474,8 @@ self: {
      }:
      mkDerivation {
        pname = "hs-ix";
-       version = "0.1.0.0";
-       sha256 = "1hn4i5j4wyi4n1cb7w9165k0dwkvzy4n9vi2j12p65m9bai8p4zm";
+       version = "0.1.1.0";
+       sha256 = "1a1plgzbqk4jhf5lyfx82yillcmy38lzlqwsfhnlka5h6f9j10hx";
        libraryHaskellDepends = [
          base base-unicode-symbols hs-functors util
        ];
@@ -140167,8 +140192,8 @@ self: {
      }:
      mkDerivation {
        pname = "jvm-binary";
-       version = "0.6.1";
-       sha256 = "0pz7md5y422mh7lcsshllqwhk6zsxl2szqw44css4m40gr196wnx";
+       version = "0.7.0";
+       sha256 = "1ism2fq66qdh72nm9cq4km9yn7v79j2qq6glpyf9yk10549kv7dv";
        libraryHaskellDepends = [
          attoparsec base binary bytestring containers data-binary-ieee754
          deepseq deriving-compat mtl template-haskell text vector
@@ -143809,6 +143834,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "language-c_0_8_3" = callPackage
+    ({ mkDerivation, alex, array, base, bytestring, containers, deepseq
+     , directory, filepath, happy, pretty, process, syb
+     }:
+     mkDerivation {
+       pname = "language-c";
+       version = "0.8.3";
+       sha256 = "0bi02jdirkys8v7flf39vrpla2a74z1z0sdhy9lb9v7cmcc6rmpk";
+       libraryHaskellDepends = [
+         array base bytestring containers deepseq directory filepath pretty
+         process syb
+       ];
+       libraryToolDepends = [ alex happy ];
+       testHaskellDepends = [ base directory filepath process ];
+       description = "Analysis and generation of C code";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "language-c-comments" = callPackage
     ({ mkDerivation, alex, array, base, language-c }:
      mkDerivation {
@@ -144467,22 +144511,17 @@ self: {
      }) {};
 
   "language-nix" = callPackage
-    ({ mkDerivation, base, base-compat, Cabal, deepseq, doctest, lens
-     , pretty, QuickCheck
+    ({ mkDerivation, base, deepseq, lens, parsec-class, pretty
+     , QuickCheck
      }:
      mkDerivation {
        pname = "language-nix";
-       version = "2.1.0.1";
-       sha256 = "1kqsw0hk03wdn7mszyjgi38nxk1wmhbxfv6di3irrhsaf807657h";
-       revision = "1";
-       editedCabalFile = "1zv12p4ralrks0517zs52rzmzmsxxkcxkqz7zijfgcsvh6bsmafi";
+       version = "2.2.0";
+       sha256 = "1lq07311dg4a32zdp5bc20bw94g0c7pdzxdiwi2y4zbhd1944rzx";
        libraryHaskellDepends = [
-         base base-compat Cabal deepseq lens pretty QuickCheck
-       ];
-       testHaskellDepends = [
-         base base-compat Cabal deepseq doctest lens pretty QuickCheck
+         base deepseq lens parsec-class pretty QuickCheck
        ];
-       description = "Data types and useful functions to represent and manipulate the Nix language";
+       description = "Data types and functions to represent the Nix language";
        license = stdenv.lib.licenses.bsd3;
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
@@ -145483,6 +145522,8 @@ self: {
        pname = "lazy-io-streams";
        version = "0.1.0.0";
        sha256 = "022x0sikvdsvpp0gh7q82sdpd5kxd2zmprdpmf7z4c3hf4xk9vxy";
+       revision = "1";
+       editedCabalFile = "0pn446g45naqh92g9mib98fw5xznbp6r4x27acmnqrmlcqjz9jsm";
        libraryHaskellDepends = [ base bytestring io-streams ];
        description = "Get lazy with your io-streams";
        license = stdenv.lib.licenses.bsd3;
@@ -145494,8 +145535,8 @@ self: {
     ({ mkDerivation, base, containers, doctest, lens, markdown-unlit }:
      mkDerivation {
        pname = "lazy-priority-queue";
-       version = "0.1";
-       sha256 = "0cjp9pvwrgldkrkg72xyq2mrr4yqzzsb4ng5as0b56zq4dgzvlib";
+       version = "0.1.0.1";
+       sha256 = "1v0jxf56wxlncw0nppmnm89j14hn8a81swr1y2sbk7gsqf73qd8v";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -145503,7 +145544,7 @@ self: {
        testHaskellDepends = [ base doctest lens ];
        testToolDepends = [ markdown-unlit ];
        description = "Lazy-Spined Monadic Priority Queues";
-       license = stdenv.lib.licenses.gpl3;
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "lazy-search" = callPackage
@@ -146589,6 +146630,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lens-regex-pcre_1_0_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, gauge, hspec, lens, pcre-heavy
+     , template-haskell, text
+     }:
+     mkDerivation {
+       pname = "lens-regex-pcre";
+       version = "1.0.0.0";
+       sha256 = "02am0q60nhn93jlrxskcc33mcgn0la8y4074vv0rbxxshbxz6k4h";
+       libraryHaskellDepends = [
+         base bytestring lens pcre-heavy template-haskell text
+       ];
+       testHaskellDepends = [
+         base bytestring hspec lens pcre-heavy template-haskell text
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring gauge lens pcre-heavy template-haskell text
+       ];
+       description = "A lensy interface to regular expressions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lens-simple" = callPackage
     ({ mkDerivation, base, lens-family, lens-family-core
      , lens-family-th, mtl, transformers
@@ -147122,8 +147185,8 @@ self: {
        pname = "libarchive";
        version = "1.0.5.1";
        sha256 = "1fchnvs03hg513v7a45a3qbfr3kbh3nmqjqljzr2y1mg2ghkr7cz";
-       revision = "4";
-       editedCabalFile = "0wzw962gl9lm5faaa86z4q7s9cbzqn346cmlbhr518dbnw7nv31d";
+       revision = "5";
+       editedCabalFile = "1fmsrrg8q46fwv6zgg5afc5jyd9y1qz193ypyh2kb4zf9psl3bdc";
        libraryHaskellDepends = [
          base bytestring composition-prelude dlist filepath
        ];
@@ -151330,7 +151393,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "logging-effect_1_3_5" = callPackage
+  "logging-effect_1_3_6" = callPackage
     ({ mkDerivation, async, base, bytestring, criterion, exceptions
      , fast-logger, free, lifted-async, monad-control, monad-logger, mtl
      , prettyprinter, semigroups, stm, stm-delay, text, time
@@ -151338,8 +151401,8 @@ self: {
      }:
      mkDerivation {
        pname = "logging-effect";
-       version = "1.3.5";
-       sha256 = "1ydkgjq3xpl7bqyax8ff6kvd9hjbyddgayrw43afdzbky1d0qawq";
+       version = "1.3.6";
+       sha256 = "1bcc7m2r4hhl03s91qixfc5w26pbdb7hy9dp6lzdahw6q7pn0hkw";
        libraryHaskellDepends = [
          async base exceptions free monad-control mtl prettyprinter
          semigroups stm stm-delay text time transformers transformers-base
@@ -152122,6 +152185,19 @@ self: {
        broken = true;
      }) {};
 
+  "louis" = callPackage
+    ({ mkDerivation, base, bytestring, JuicyPixels, text, vector }:
+     mkDerivation {
+       pname = "louis";
+       version = "0.1.0.2";
+       sha256 = "0bw07idhhnyxfsry5qq8hs5fdbp810j7i2syd1vfqdsbm2krq816";
+       libraryHaskellDepends = [
+         base bytestring JuicyPixels text vector
+       ];
+       description = "Turning images into text using Braille font";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "loup" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-swf, base, bytestring
      , conduit, lifted-async, lifted-base, optparse-generic, preamble
@@ -152971,10 +153047,8 @@ self: {
      }:
      mkDerivation {
        pname = "lzlib";
-       version = "0.2.0.0";
-       sha256 = "0m0kx2drrxy01rf7a231pjqk783gcqqkjn831bcx0dbqksaz6fvm";
-       revision = "1";
-       editedCabalFile = "0jjl1rdlh8cms7pbd9y258s817l77nql4ayq12qy8c9vvxdyamh8";
+       version = "0.2.0.1";
+       sha256 = "0cp33l990na6wz9yb0kx2nzq3hqxpyc7s47xg0bvia8sajrkzdw6";
        libraryHaskellDepends = [ base bytestring ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base bytestring directory hspec ];
@@ -156891,6 +156965,8 @@ self: {
        pname = "meminfo";
        version = "0.2.0.0";
        sha256 = "1mxk57qr4d1k6sz4qld09d61nc15hixggc5klfj5xr0n8rw1za3x";
+       revision = "1";
+       editedCabalFile = "10r7ji1xb8zv7a1ilyp626chly9y8m1i67adxqrj8lwgkqxpl8nk";
        libraryHaskellDepends = [ attoparsec base bytestring containers ];
        description = "Library for reading `/proc/meminfo`";
        license = stdenv.lib.licenses.bsd3;
@@ -159461,6 +159537,17 @@ self: {
        broken = true;
      }) {};
 
+  "mm2" = callPackage
+    ({ mkDerivation, base, vector }:
+     mkDerivation {
+       pname = "mm2";
+       version = "0.1.1.0";
+       sha256 = "0zn629lm41z6b59snnjkqdk41ryimjhd5yapiwykl5fg0f7wmap3";
+       libraryHaskellDepends = [ base vector ];
+       description = "The library that can be used for optimization of multiple (Ord a) => a -> b transformations";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "mmap" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
@@ -161813,8 +161900,10 @@ self: {
      }:
      mkDerivation {
        pname = "monoid-statistics";
-       version = "1.0.0";
-       sha256 = "0n3q8izk197lrkvm6hmdzg7dl1mzji2z09b1wkz02pm4y0gganv3";
+       version = "1.0.1.0";
+       sha256 = "1krgyvshvw28ld89hb1qpjx8jiz40a8yq2q3zglrir4vfch5cyx9";
+       revision = "1";
+       editedCabalFile = "14p36fz2yssx92imqggv5xrsnqqhhh3xj2ba96v47fm2dglgfsrv";
        libraryHaskellDepends = [
          base math-functions vector vector-th-unbox
        ];
@@ -166633,17 +166722,19 @@ self: {
      }:
      mkDerivation {
        pname = "net-mqtt";
-       version = "0.5.0.2";
-       sha256 = "1dq1f9kkdrz8yf6yj9xzfyna6rnkzv0vmsrzg92vbkyqfhkw6fga";
+       version = "0.5.1.0";
+       sha256 = "0wqrzp39d9c04j1lqsk8kn727bymcq8jk12v330l527lm5g76adj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          async attoparsec attoparsec-binary base binary bytestring conduit
-         conduit-extra containers network-conduit-tls network-uri stm text
+         conduit-extra containers network-conduit-tls network-uri QuickCheck
+         stm text
        ];
        executableHaskellDepends = [
          async attoparsec attoparsec-binary base binary bytestring conduit
-         conduit-extra containers network-conduit-tls network-uri stm text
+         conduit-extra containers network-conduit-tls network-uri QuickCheck
+         stm text
        ];
        testHaskellDepends = [
          async attoparsec attoparsec-binary base binary bytestring conduit
@@ -168647,6 +168738,21 @@ self: {
        broken = true;
      }) {};
 
+  "newtype-zoo" = callPackage
+    ({ mkDerivation, base, data-default, deepseq, pointed, profunctors
+     , QuickCheck, random
+     }:
+     mkDerivation {
+       pname = "newtype-zoo";
+       version = "1.1.0.0";
+       sha256 = "0sw476mmczq6gfgbbbrybrna472p5bjrimsbblw9rlyzcg2szqrp";
+       libraryHaskellDepends = [
+         base data-default deepseq pointed profunctors QuickCheck random
+       ];
+       description = "Newtype Wrapper Zoo";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "newtyper" = callPackage
     ({ mkDerivation, base, Kleislify, newtype }:
      mkDerivation {
@@ -174301,29 +174407,26 @@ self: {
      }) {};
 
   "otp-authenticator" = callPackage
-    ({ mkDerivation, aeson, base, bifunctors, binary, bytestring
+    ({ mkDerivation, aeson, base, base-compat, binary, bytestring
      , containers, cryptonite, dependent-sum, filepath, h-gpgme
-     , haskeline, microlens, one-time-password, optparse-applicative
-     , sandi, singletons, text, time, transformers, trifecta
-     , type-combinators, unix, uri-encode, witherable, yaml
+     , haskeline, megaparsec, microlens, optparse-applicative, sandi
+     , text, time, transformers, unix, uri-encode, vinyl, yaml
      }:
      mkDerivation {
        pname = "otp-authenticator";
-       version = "0.1.0.1";
-       sha256 = "1f30mr512rwbx58wkfqk3cyw471mw1lyz0jmcjj4lhknhf0agvhm";
+       version = "0.1.1.0";
+       sha256 = "0hmyq7ris01gnkydxi9i2p5v2c5cps4mg4zmxbzlyjrkyn7d5la4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bifunctors binary bytestring containers cryptonite
-         dependent-sum filepath h-gpgme haskeline microlens
-         one-time-password optparse-applicative sandi singletons text time
-         transformers trifecta type-combinators unix uri-encode witherable
-         yaml
+         aeson base base-compat binary bytestring containers cryptonite
+         dependent-sum filepath h-gpgme haskeline megaparsec microlens
+         optparse-applicative sandi text time transformers unix uri-encode
+         vinyl yaml
        ];
        executableHaskellDepends = [
          aeson base binary bytestring h-gpgme text yaml
        ];
-       testHaskellDepends = [ base ];
        description = "OTP Authenticator (a la google) command line client";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -178776,14 +178879,14 @@ self: {
      }) {};
 
   "perceptual-hash" = callPackage
-    ({ mkDerivation, base, containers, cpphs, criterion, filepath, hip
-     , hspec, optparse-applicative, par-traverse, primitive, repa, stm
-     , vector, vector-algorithms
+    ({ mkDerivation, base, containers, cpphs, criterion, deepseq
+     , filepath, hip, hspec, optparse-applicative, par-traverse
+     , primitive, repa, stm, vector, vector-algorithms
      }:
      mkDerivation {
        pname = "perceptual-hash";
-       version = "0.1.2.0";
-       sha256 = "0wj5bnm4f2n2fd1ykf0n5cbf974x34nzy16dh7z2wxv2yn7b4f9r";
+       version = "0.1.3.0";
+       sha256 = "1g7hp5ijfqc2b3jacgabhq1mza9lqlxid309cvcm0jgppm4lvdpp";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -178794,7 +178897,7 @@ self: {
          base containers filepath optparse-applicative par-traverse stm
        ];
        testHaskellDepends = [ base hspec ];
-       benchmarkHaskellDepends = [ base criterion filepath ];
+       benchmarkHaskellDepends = [ base criterion deepseq filepath ];
        benchmarkToolDepends = [ cpphs ];
        description = "Find duplicate images";
        license = stdenv.lib.licenses.bsd3;
@@ -181153,8 +181256,6 @@ self: {
        ];
        description = "Back up the notes you've saved to Pinboard";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pinch" = callPackage
@@ -190333,8 +190434,8 @@ self: {
      }:
      mkDerivation {
        pname = "purebred-email";
-       version = "0.2.0.0";
-       sha256 = "1jjdia8qlwdibmfrqasyvm6qq01pxc9r66qmbyjmhz9bhdkqdd61";
+       version = "0.3.0.0";
+       sha256 = "0c2qmw29pbnh5kz9pkl7h4gvcs0nc671y2pjfdj3vsj0av3xqz9n";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -193737,6 +193838,27 @@ self: {
        broken = true;
      }) {};
 
+  "rank2classes_1_3_1" = callPackage
+    ({ mkDerivation, base, distributive, doctest, markdown-unlit, tasty
+     , tasty-hunit, template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "rank2classes";
+       version = "1.3.1";
+       sha256 = "07ykacy93c1rgh9a5ndkkhaviyfr61xfhi430rpwamk4h6i6qiy3";
+       libraryHaskellDepends = [
+         base distributive template-haskell transformers
+       ];
+       testHaskellDepends = [
+         base distributive doctest tasty tasty-hunit
+       ];
+       testToolDepends = [ markdown-unlit ];
+       description = "standard type constructor class hierarchy, only with methods of rank 2 types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "rapid" = callPackage
     ({ mkDerivation, async, base, containers, foreign-store, stm }:
      mkDerivation {
@@ -195246,6 +195368,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "reanimate-svg_0_9_2_1" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers, hspec
+     , JuicyPixels, lens, linear, mtl, scientific, svg-tree, text
+     , transformers, vector, xml
+     }:
+     mkDerivation {
+       pname = "reanimate-svg";
+       version = "0.9.2.1";
+       sha256 = "018jkgiry2yaq7nl8sks4ahjdx5pjgdj99gc6k4l3rfmd1zxvsng";
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers JuicyPixels lens linear mtl
+         scientific text transformers vector xml
+       ];
+       testHaskellDepends = [
+         attoparsec base hspec linear scientific svg-tree
+       ];
+       description = "SVG file loader and serializer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "reason-export" = callPackage
     ({ mkDerivation, base, bytestring, containers, Diff, directory
      , formatting, hashable, hspec, hspec-core, HUnit, mtl, QuickCheck
@@ -203108,6 +203251,8 @@ self: {
        pname = "safecopy";
        version = "0.9.4.3";
        sha256 = "020z2cdarpy8crz6b871lprgacwi6zsmmwml35ban93hdfjv2zbq";
+       revision = "1";
+       editedCabalFile = "060yxbk2fy5gddnpf6kxppc9fwkhiyldm39bj7873wggnpdc2xds";
        libraryHaskellDepends = [
          array base bytestring cereal containers old-time template-haskell
          text time vector
@@ -206144,6 +206289,30 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {inherit (pkgs) secp256k1;};
 
+  "secp256k1-haskell_0_1_5" = callPackage
+    ({ mkDerivation, base, base16-bytestring, bytestring, cereal
+     , entropy, hashable, hspec, hspec-discover, HUnit, mtl, QuickCheck
+     , secp256k1, string-conversions
+     }:
+     mkDerivation {
+       pname = "secp256k1-haskell";
+       version = "0.1.5";
+       sha256 = "1s989dk7zncz68zl3k13dk8ap7dq5k4m2kwimpbicizxfnl7gzfg";
+       libraryHaskellDepends = [
+         base base16-bytestring bytestring cereal entropy hashable
+         QuickCheck string-conversions
+       ];
+       librarySystemDepends = [ secp256k1 ];
+       testHaskellDepends = [
+         base base16-bytestring bytestring cereal entropy hashable hspec
+         HUnit mtl QuickCheck string-conversions
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Bindings for secp256k1 library from Bitcoin Core";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) secp256k1;};
+
   "secp256k1-legacy" = callPackage
     ({ mkDerivation, base, base16-bytestring, bytestring, Cabal, cereal
      , cryptohash, entropy, HUnit, mtl, QuickCheck, string-conversions
@@ -206298,6 +206467,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "selda_0_5_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, exceptions, mtl
+     , random, text, time, uuid-types
+     }:
+     mkDerivation {
+       pname = "selda";
+       version = "0.5.0.0";
+       sha256 = "1dsyc69fvqqhq9a9n97dnp81vvxxpf4dg4f5yan3fdr7zn9qgx3f";
+       libraryHaskellDepends = [
+         base bytestring containers exceptions mtl random text time
+         uuid-types
+       ];
+       description = "Multi-backend, high-level EDSL for interacting with SQL databases";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "selda-json" = callPackage
     ({ mkDerivation, aeson, base, bytestring, selda, text }:
      mkDerivation {
@@ -206311,6 +206497,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "selda-json_0_1_1_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, selda, text }:
+     mkDerivation {
+       pname = "selda-json";
+       version = "0.1.1.0";
+       sha256 = "1ai24qmz5nkpqx0zd24ix0ci5aqiccfy57fkf8f87swrv28101l8";
+       libraryHaskellDepends = [ aeson base bytestring selda text ];
+       description = "JSON support for the Selda database library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "selda-postgresql" = callPackage
     ({ mkDerivation, base, bytestring, exceptions, postgresql-binary
      , postgresql-libpq, selda, selda-json, text, time, uuid-types
@@ -206489,6 +206687,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "semantic-source" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, deepseq, doctest
+     , generic-monoid, hashable, hedgehog, QuickCheck, semilattices
+     , tasty, tasty-hedgehog, tasty-hunit, text
+     }:
+     mkDerivation {
+       pname = "semantic-source";
+       version = "0.0.0.0";
+       sha256 = "1zvqr8a5pm32hcwxxgnbyp773ld4c29m20v7hghcmkgfdayps5r1";
+       libraryHaskellDepends = [
+         aeson base bytestring deepseq generic-monoid hashable semilattices
+         text
+       ];
+       testHaskellDepends = [
+         base doctest hedgehog QuickCheck tasty tasty-hedgehog tasty-hunit
+         text
+       ];
+       description = "Types and functionality for working with source code";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "semaphore-plus" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -210032,8 +210253,8 @@ self: {
      }:
      mkDerivation {
        pname = "serverless-haskell";
-       version = "0.8.10";
-       sha256 = "1gvswqkdk5awnvjqzvhbrvdmsyj73kiph872fvplmmdyvq8hb8gy";
+       version = "0.8.11";
+       sha256 = "1jvfjq7qlyqyprvhlk0licr8mrnc7xn5l4g3l95g3x4qii48j4s0";
        libraryHaskellDepends = [
          aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis
          amazonka-s3 base bytestring case-insensitive http-types iproute
@@ -210048,8 +210269,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Deploying Haskell code onto AWS Lambda using Serverless";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "serversession" = callPackage
@@ -210511,6 +210730,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "setlocale_1_0_0_9" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "setlocale";
+       version = "1.0.0.9";
+       sha256 = "18b6xafspzxrmz5m9r9nzy3z053crqi59xc8n8aqd4gw0pvqdcrv";
+       revision = "1";
+       editedCabalFile = "01i087l8v129q90jf09khaw5p4iqix5s17gzgfz2pbi030zhb82h";
+       libraryHaskellDepends = [ base ];
+       description = "Haskell bindings to setlocale";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "setoid" = callPackage
     ({ mkDerivation, base, containers, mtl, smallcheck, tasty
      , tasty-discover, tasty-hunit, tasty-quickcheck, tasty-smallcheck
@@ -212017,8 +212250,6 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Simple shell scripting from Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shh-extras" = callPackage
@@ -212031,8 +212262,6 @@ self: {
        testHaskellDepends = [ base tasty ];
        description = "Utility functions for using shh";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shift" = callPackage
@@ -212258,6 +212487,8 @@ self: {
        pname = "show-combinators";
        version = "0.1.1.0";
        sha256 = "02h2fvmw22v1mpxlxn9c6p7as3xspvspdphybxapac4s50mvyfnm";
+       revision = "1";
+       editedCabalFile = "1zr6xw4fvgx187yiqy7n0r9mnasyv1hxg2q9xzw3lmsf4z3xz6y7";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Combinators to write Show instances";
@@ -213402,8 +213633,8 @@ self: {
     ({ mkDerivation, base, mtl, parsec, pretty, tasty, tasty-hunit }:
      mkDerivation {
        pname = "simple-sql-parser";
-       version = "0.5.0";
-       sha256 = "0d063wyrz8qynngy499i00hjkacd0xg01qni1wx2cbrcxg0xwcpd";
+       version = "0.6.0";
+       sha256 = "11jpqh00nfdldpanrcy01jd6xyg4xvz3b8g4csc8kswc47wff82i";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mtl parsec pretty ];
@@ -225676,6 +225907,8 @@ self: {
        pname = "svfactor";
        version = "0.1";
        sha256 = "1vjdv7xgd33z3iwwlh8xwp9za06jvqxpbssc4m5bmcx1wihsnn35";
+       revision = "1";
+       editedCabalFile = "1ffm727zmg402s0v2mbcxjng6b0s1idci6x01njfw4s6zwl144fv";
        libraryHaskellDepends = [
          attoparsec base bifunctors bytestring charset deepseq lens parsec
          parsers semigroupoids semigroups text transformers trifecta
@@ -231793,16 +232026,19 @@ self: {
      }) {};
 
   "text-format-heavy" = callPackage
-    ({ mkDerivation, base, bytestring, containers, data-default, parsec
-     , text, time
+    ({ mkDerivation, base, bytestring, containers, data-default, hspec
+     , labels, parsec, template-haskell, text, th-lift
+     , th-lift-instances, time
      }:
      mkDerivation {
        pname = "text-format-heavy";
-       version = "0.1.5.2";
-       sha256 = "1rzzdbi16zndbsbsc83zd24ni2z1g6ndvjn3ylwagxr9xhh0iwp5";
+       version = "0.1.5.3";
+       sha256 = "00fz6s190jpqffx2i89rbmmc7959gh70bk3w8wcflcxkzcmf3wiv";
        libraryHaskellDepends = [
-         base bytestring containers data-default parsec text time
+         base bytestring containers data-default labels parsec
+         template-haskell text th-lift th-lift-instances time
        ];
+       testHaskellDepends = [ base hspec time ];
        description = "Full-weight string formatting library, analog of Python's string.format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -238014,8 +238250,8 @@ self: {
     ({ mkDerivation, base, template-haskell, tree-sitter }:
      mkDerivation {
        pname = "tree-sitter-tsx";
-       version = "0.2.0.0";
-       sha256 = "16ql8b2dcp461182rsj2fdgz3z82jh351n436hl61jfja8dc15m8";
+       version = "0.2.1.0";
+       sha256 = "1lj2mmgqkswn8n5p4j4zdd0fw3syvg8v4d0ahnipvv1b05g1y1f4";
        libraryHaskellDepends = [ base template-haskell tree-sitter ];
        doHaddock = false;
        description = "Tree-sitter grammar/parser for TSX";
@@ -238028,8 +238264,8 @@ self: {
     ({ mkDerivation, base, template-haskell, tree-sitter }:
      mkDerivation {
        pname = "tree-sitter-typescript";
-       version = "0.2.0.0";
-       sha256 = "0pcxxgqz0w58fnfy1cbqwj7mmqj8nnkm2rkpp6h6agawsiswi8kz";
+       version = "0.2.1.0";
+       sha256 = "1dgb5b1yhpwrr8qd18l4jlxx3g5c34zaxffh934pssyldckfbid6";
        libraryHaskellDepends = [ base template-haskell tree-sitter ];
        doHaddock = false;
        description = "Tree-sitter grammar/parser for TypeScript";
@@ -238800,6 +239036,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ttl-hashtables_1_4_0_0" = callPackage
+    ({ mkDerivation, base, clock, containers, data-default, failable
+     , hashable, hashtables, hspec, mtl, transformers
+     }:
+     mkDerivation {
+       pname = "ttl-hashtables";
+       version = "1.4.0.0";
+       sha256 = "0s8ia8sd3j5k05gv57agbxar6bnpigwcy53ypz3j3pml90sdm820";
+       libraryHaskellDepends = [
+         base clock containers data-default failable hashable hashtables mtl
+         transformers
+       ];
+       testHaskellDepends = [
+         base clock containers data-default failable hashable hashtables
+         hspec mtl transformers
+       ];
+       description = "Extends hashtables so that entries added can be expired after a TTL";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ttn" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hspec, hspec-expectations
      , raw-strings-qq, text, time, timerep
@@ -239226,6 +239483,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "turtle_1_5_15" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
+     , containers, criterion, directory, doctest, exceptions, fail
+     , foldl, hostname, managed, optional-args, optparse-applicative
+     , process, semigroups, stm, streaming-commons, system-fileio
+     , system-filepath, temporary, text, time, transformers, unix
+     , unix-compat
+     }:
+     mkDerivation {
+       pname = "turtle";
+       version = "1.5.15";
+       sha256 = "0yckgsc2a4g5x867gni80ldp226bsnhncfbil4ql6v2zwm4r8p7f";
+       libraryHaskellDepends = [
+         ansi-wl-pprint async base bytestring clock containers directory
+         exceptions foldl hostname managed optional-args
+         optparse-applicative process semigroups stm streaming-commons
+         system-fileio system-filepath temporary text time transformers unix
+         unix-compat
+       ];
+       testHaskellDepends = [
+         base doctest fail system-filepath temporary
+       ];
+       benchmarkHaskellDepends = [ base criterion text ];
+       description = "Shell programming, Haskell-style";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "turtle-options" = callPackage
     ({ mkDerivation, base, HUnit, optional-args, parsec, text, turtle
      }:
@@ -243777,15 +244062,16 @@ self: {
      }) {};
 
   "urbit-hob" = callPackage
-    ({ mkDerivation, base, bytestring, hspec, hspec-core, murmur3
-     , QuickCheck, text, vector
+    ({ mkDerivation, base, bytestring, criterion, deepseq, hspec
+     , hspec-core, murmur3, QuickCheck, text, vector
      }:
      mkDerivation {
        pname = "urbit-hob";
-       version = "0.2.0";
-       sha256 = "1wyvlwhc8pv4iv2dgkl5a7vz8pyykp42fmsr3ar08q58y7k269fg";
+       version = "0.3.0";
+       sha256 = "00ldbja79h5alf1wwxvrsah9v8fxam47cm2ypap9sni4w9kan5gk";
        libraryHaskellDepends = [ base bytestring murmur3 text vector ];
        testHaskellDepends = [ base hspec hspec-core QuickCheck text ];
+       benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Hoon-style atom manipulation and printing functions";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -247726,8 +248012,8 @@ self: {
      }:
      mkDerivation {
        pname = "waargonaut";
-       version = "0.8.0.0";
-       sha256 = "1pvs379s1w5nzr5hb1c5fbbbjgvsnvggj3l1l5j6klm0zf1y7x4h";
+       version = "0.8.0.1";
+       sha256 = "1rfmj9c87ql6mfqspx58qpqx6k1pvvfvgngzbjfpdx62xknxflkf";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          attoparsec base bifunctors bytestring containers contravariant
@@ -249710,7 +249996,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "warp_3_3_1" = callPackage
+  "warp_3_3_2" = callPackage
     ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked
      , bytestring, case-insensitive, containers, directory, gauge
      , ghc-prim, hashable, hspec, http-client, http-date, http-types
@@ -249720,8 +250006,8 @@ self: {
      }:
      mkDerivation {
        pname = "warp";
-       version = "3.3.1";
-       sha256 = "0qay9h5cby5vcb1nkbrn4ch5xmj2i01g8f3psmvbgs854w2x0ygn";
+       version = "3.3.2";
+       sha256 = "1sh1jp27azf8zdzhaqg5ab8mky4wgdacwd5cd9zrk3dbbarkf94i";
        libraryHaskellDepends = [
          array async auto-update base bsb-http-chunked bytestring
          case-insensitive containers ghc-prim hashable http-date http-types
@@ -250561,8 +250847,8 @@ self: {
      }:
      mkDerivation {
        pname = "webby";
-       version = "0.1.1";
-       sha256 = "0415vhp8h3lr8wlfkg6a7njq19ka1wyi9klcmsd117phd9m46whb";
+       version = "0.1.3";
+       sha256 = "1ry3cbi9awpxvj8f84b65ml9f73n5c1nw0ckc32hg55cq84yva9f";
        libraryHaskellDepends = [
          aeson base binary bytestring fast-logger formatting http-api-data
          http-types monad-logger protolude resourcet text unliftio
@@ -252027,6 +252313,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "witherable_0_3_4" = callPackage
+    ({ mkDerivation, base, base-orphans, containers, hashable, lens
+     , monoidal-containers, transformers, transformers-compat
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "witherable";
+       version = "0.3.4";
+       sha256 = "19qkb8ww3vp446jr1yd4x4wxqm725lc6n2f3d1n3hb925x2djcd6";
+       libraryHaskellDepends = [
+         base base-orphans containers hashable lens monoidal-containers
+         transformers transformers-compat unordered-containers vector
+       ];
+       description = "filterable traversable";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "witness" = callPackage
     ({ mkDerivation, base, constraints, semigroupoids, transformers }:
      mkDerivation {
@@ -252290,6 +252594,17 @@ self: {
        broken = true;
      }) {};
 
+  "woe" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "woe";
+       version = "0.1.0.3";
+       sha256 = "0f0pa2vlp56j35llhzq1qqkwkfpm7r96av8jw22jngd0kcpc185b";
+       libraryHaskellDepends = [ base ];
+       description = "Convenient typeclass for defining arbitrary-index enums";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "woffex" = callPackage
     ({ mkDerivation, base, binary, bytestring, filepath, zlib }:
      mkDerivation {
@@ -252773,7 +253088,7 @@ self: {
          base containers exceptions free spiros split text transformers
        ];
        executableHaskellDepends = [ base ];
-       description = "Automate keyboard\/mouse\/clipboard\/application interaction";
+       description = "Automate keyboard/mouse/clipboard/application interaction";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
@@ -255426,6 +255741,27 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
+  "xmonad-contrib_0_16" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory
+     , extensible-exceptions, filepath, mtl, old-locale, old-time
+     , process, random, semigroups, unix, utf8-string, X11, X11-xft
+     , xmonad
+     }:
+     mkDerivation {
+       pname = "xmonad-contrib";
+       version = "0.16";
+       sha256 = "1pddgkvnbww28wykncc7j0yb0lv15bk7xnnhdcbrwkxzw66w6wmd";
+       libraryHaskellDepends = [
+         base bytestring containers directory extensible-exceptions filepath
+         mtl old-locale old-time process random semigroups unix utf8-string
+         X11 X11-xft xmonad
+       ];
+       description = "Third party extensions for xmonad";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ peti ];
+     }) {};
+
   "xmonad-contrib-bluetilebranch" = callPackage
     ({ mkDerivation, base, containers, directory, extensible-exceptions
      , mtl, old-locale, old-time, process, random, unix, utf8-string
diff --git a/nixpkgs/pkgs/development/haskell-modules/patches/amazonka-Allow-http-client-0.6.patch b/nixpkgs/pkgs/development/haskell-modules/patches/amazonka-Allow-http-client-0.6.patch
new file mode 100644
index 000000000000..9e1eeb751602
--- /dev/null
+++ b/nixpkgs/pkgs/development/haskell-modules/patches/amazonka-Allow-http-client-0.6.patch
@@ -0,0 +1,24 @@
+From 657b70d174fe5cb61e56cb8b9c5e57f1ec216f2b Mon Sep 17 00:00:00 2001
+From: Mikhail Glushenkov <mikhail.glushenkov@gmail.com>
+Date: Wed, 10 Apr 2019 17:42:57 +0100
+Subject: [PATCH] Allow http-client 0.6.*.
+
+Changelog doesn't list any silently breaking semantic changes.
+---
+ amazonka/amazonka.cabal  | 2 +-
+ core/amazonka-core.cabal | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/amazonka/amazonka.cabal b/amazonka/amazonka.cabal
+index e86713f11c..81c4cb7e48 100644
+--- a/amazonka.cabal
++++ b/amazonka.cabal
+@@ -67,7 +67,7 @@ library
+         , conduit-extra       >= 1.1
+         , directory           >= 1.2
+         , exceptions          >= 0.6
+-        , http-client         >= 0.4 && < 0.6
++        , http-client         >= 0.4 && < 0.7
+         , http-conduit        >= 2.1.7 && < 3
+         , http-types          >= 0.8
+         , ini                 >= 0.3.5
diff --git a/nixpkgs/pkgs/development/haskell-modules/patches/amazonka-core-Allow-http-client-0.6.patch b/nixpkgs/pkgs/development/haskell-modules/patches/amazonka-core-Allow-http-client-0.6.patch
new file mode 100644
index 000000000000..d99072d79c6e
--- /dev/null
+++ b/nixpkgs/pkgs/development/haskell-modules/patches/amazonka-core-Allow-http-client-0.6.patch
@@ -0,0 +1,26 @@
+From 657b70d174fe5cb61e56cb8b9c5e57f1ec216f2b Mon Sep 17 00:00:00 2001
+From: Mikhail Glushenkov <mikhail.glushenkov@gmail.com>
+Date: Wed, 10 Apr 2019 17:42:57 +0100
+Subject: [PATCH] Allow http-client 0.6.*.
+
+Changelog doesn't list any silently breaking semantic changes.
+---
+ amazonka/amazonka.cabal  | 2 +-
+ core/amazonka-core.cabal | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/core/amazonka-core.cabal b/core/amazonka-core.cabal
+index 9796e007cf..eccb24e5bd 100644
+--- a/amazonka-core.cabal
++++ b/amazonka-core.cabal
+@@ -90,7 +90,7 @@ library
+         , deepseq              >= 1.4
+         , exceptions           >= 0.6
+         , hashable             >= 1.2
+-        , http-client          >= 0.4 && < 0.6
++        , http-client          >= 0.4 && < 0.7
+         , http-conduit         >= 2.1.4 && < 3
+         , http-types           >= 0.8 && (<0.11 || >=0.12)
+         , lens                 >= 4.4
+--
+2.23.0
diff --git a/nixpkgs/pkgs/development/interpreters/janet/default.nix b/nixpkgs/pkgs/development/interpreters/janet/default.nix
index 197127d8b6d4..d00e37733f2a 100644
--- a/nixpkgs/pkgs/development/interpreters/janet/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/janet/default.nix
@@ -2,17 +2,17 @@
 
 stdenv.mkDerivation rec {
   pname = "janet";
-  version = "1.2.0";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "janet-lang";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1m34j4h8gh5d773hbw55gs1gimli7ccqpwddn4dd59hzhpihwgqz";
+    sha256 = "160wd3436cl50wkvqpaf6mbb69qlzzammcg5yb07wx9yw31g399p";
   };
 
   nativeBuildInputs = [ meson ninja ];
-  mesonFlags = ["-Dgit_hash=release"];
+  mesonFlags = [ "-Dgit_hash=release" ];
 
   doCheck = true;
 
diff --git a/nixpkgs/pkgs/development/java-modules/jogl/default.nix b/nixpkgs/pkgs/development/java-modules/jogl/default.nix
index d179fb531789..80f19ab65f5c 100644
--- a/nixpkgs/pkgs/development/java-modules/jogl/default.nix
+++ b/nixpkgs/pkgs/development/java-modules/jogl/default.nix
@@ -1,9 +1,5 @@
-{ stdenv, fetchgit, ant, jdk, openjdk8, zulu8, git, xorg, udev, libGL, libGLU }:
+{ stdenv, fetchgit, ant, jdk, git, xorg, udev, libGL, libGLU }:
 
-let
-  # workaround https://github.com/NixOS/nixpkgs/issues/37364
-  jdk-without-symlinks = if jdk == openjdk8 then zulu8 else jdk;
-in
 {
   jogl_2_3_2 =
     let
@@ -32,7 +28,8 @@ in
           -exec sed -i 's@"libGLU.so"@"${libGLU}/lib/libGLU.so"@' {} \;
       '';
 
-      buildInputs = [ jdk-without-symlinks ant git udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXt xorg.libXxf86vm xorg.libXrender ];
+      nativeBuildInputs = [ jdk ant git ];
+      buildInputs = [ udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXt xorg.libXxf86vm xorg.libXrender ];
 
       buildPhase = ''
         cp -r ${gluegen-src} $NIX_BUILD_TOP/gluegen
diff --git a/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix b/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix
index 1cc65b53b3e9..6bfb80d3a174 100644
--- a/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, zlib
+{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, zlib, fetchpatch
 , aws-c-common, aws-c-event-stream, aws-checksums
 , CoreAudio, AudioToolbox
 , # Allow building a limited set of APIs, e.g. ["s3" "ec2"].
@@ -50,6 +50,13 @@ stdenv.mkDerivation rec {
 
   __darwinAllowLocalNetworking = true;
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/aws/aws-sdk-cpp/commit/42991ab549087c81cb630e5d3d2413e8a9cf8a97.patch";
+      sha256 = "0myq5cm3lvl5r56hg0sc0zyn1clbkd9ys0wr95ghw6bhwpvfv8gr";
+    })
+  ];
+
   meta = with lib; {
     description = "A C++ interface for Amazon Web Services";
     homepage = https://github.com/awslabs/aws-sdk-cpp;
diff --git a/nixpkgs/pkgs/development/libraries/gmp/6.x.nix b/nixpkgs/pkgs/development/libraries/gmp/6.x.nix
index de31128e5a67..d9ea5a71dd30 100644
--- a/nixpkgs/pkgs/development/libraries/gmp/6.x.nix
+++ b/nixpkgs/pkgs/development/libraries/gmp/6.x.nix
@@ -37,7 +37,7 @@ let self = stdenv.mkDerivation rec {
     "--build=${stdenv.buildPlatform.config}"
   ] ++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions"
     ++ optional (stdenv.isDarwin && stdenv.is64bit) "ABI=64"
-    ++ optional (with stdenv.hostPlatform; useAndroidPrebuilt || useiOSPrebuilt) "--disable-assembly"
+    ++ optional (with stdenv.hostPlatform; (useAndroidPrebuilt || useiOSPrebuilt) && !isx86) "--disable-assembly"
     ;
 
   doCheck = true; # not cross;
diff --git a/nixpkgs/pkgs/development/libraries/libdrm/default.nix b/nixpkgs/pkgs/development/libraries/libdrm/default.nix
index 11fb21fe52e2..d5cbbccba015 100644
--- a/nixpkgs/pkgs/development/libraries/libdrm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdrm/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, pkgconfig, meson, ninja, libpthreadstubs, libpciaccess
-, withValgrind ? valgrind-light.meta.available, valgrind-light
+, withValgrind ? valgrind-light.meta.available, valgrind-light, fetchpatch
 }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,15 @@ stdenv.mkDerivation rec {
   buildInputs = [ libpthreadstubs libpciaccess ]
     ++ lib.optional withValgrind valgrind-light;
 
-  patches = [ ./cross-build-nm-path.patch ];
+  patches = [ ./cross-build-nm-path.patch ] ++
+    lib.optionals stdenv.hostPlatform.isMusl [
+      # Fix tests not building on musl because they use the glibc-specific
+      # (non-POSIX) `ioctl()` type signature. See #66441.
+      (fetchpatch {
+        url = "https://raw.githubusercontent.com/openembedded/openembedded-core/30a2af80f5f8c8ddf0f619e4f50451b02baa22dd/meta/recipes-graphics/drm/libdrm/musl-ioctl.patch";
+        sha256 = "0rdmh4k5kb80hhk1sdhlil30yf0s8d8w0fnq0hzyvw3ir1mki3by";
+      })
+    ];
 
   postPatch = ''
     for a in */*-symbol-check ; do
diff --git a/nixpkgs/pkgs/development/libraries/libfido2/default.nix b/nixpkgs/pkgs/development/libraries/libfido2/default.nix
index b670172ce1ee..5fefdad08e76 100644
--- a/nixpkgs/pkgs/development/libraries/libfido2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libfido2/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   pname = "libfido2";
-  version = "1.1.0";
+  version = "1.2.0";
   src = fetchurl {
     url = "https://developers.yubico.com/libfido2/Releases/libfido2-${version}.tar.gz";
-    sha256 = "1h51q9pgv54czf7k6v90b02gnvqw4dlxmz6vi0n06shpkdzv5jh1";
+    sha256 = "1pbllhzcrzkgxad00bai7lna8dpkwiv8khx8p20miy661abv956v";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/nixpkgs/pkgs/development/libraries/libgdiplus/default.nix b/nixpkgs/pkgs/development/libraries/libgdiplus/default.nix
index 9ba3cdbd09aa..558da91fcbf1 100644
--- a/nixpkgs/pkgs/development/libraries/libgdiplus/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgdiplus/default.nix
@@ -29,6 +29,8 @@ stdenv.mkDerivation {
     })
   ];
 
+  outputs = [ "out" "dev" ];
+
   hardeningDisable = [ "format" ];
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/nixpkgs/pkgs/development/libraries/libipt/default.nix b/nixpkgs/pkgs/development/libraries/libipt/default.nix
index c61053ff6932..792a74da581e 100644
--- a/nixpkgs/pkgs/development/libraries/libipt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libipt/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     description = "Intel Processor Trace decoder library";
     homepage = https://github.com/intel/libipt;
     license = licenses.bsd3;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ orivej ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix b/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix
index adf856544c48..92fe81c73f40 100644
--- a/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "19.07";
+  version = "19.09";
   pname = "libmediainfo";
   src = fetchurl {
     url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
-    sha256 = "0k3d7mha1lay2s09crc9z9zr970l617lb0c3b35wl44flkqf7jss";
+    sha256 = "13j7by2czapzi6qznxj4nmn3hwiyglcf2ypja4n6zgnz96jf21pz";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/nixpkgs/pkgs/development/libraries/libotr/default.nix b/nixpkgs/pkgs/development/libraries/libotr/default.nix
index 080a19452154..db79bad745f0 100644
--- a/nixpkgs/pkgs/development/libraries/libotr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libotr/default.nix
@@ -8,8 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "1x8rliydhbibmzwdbyr7pd7n87m2jmxnqkpvaalnf4154hj1hfwb";
   };
 
+  outputs = [ "bin" "out" "dev" ];
+
   nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ ];
   propagatedBuildInputs = [ libgcrypt ];
 
   meta = with stdenv.lib; {
diff --git a/nixpkgs/pkgs/development/libraries/libproxy/default.nix b/nixpkgs/pkgs/development/libraries/libproxy/default.nix
index 844d626f49e3..773acd035355 100644
--- a/nixpkgs/pkgs/development/libraries/libproxy/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libproxy/default.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  postFixup = ''
+  postFixup = stdenv.lib.optionalString stdenv.isLinux ''
     # config_gnome3 uses the helper to find GNOME proxy settings
     wrapProgram $out/libexec/pxgsettings --prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}"
   '';
diff --git a/nixpkgs/pkgs/development/libraries/libvterm-neovim/default.nix b/nixpkgs/pkgs/development/libraries/libvterm-neovim/default.nix
index 48dbc5f395c8..231b426e6a7d 100644
--- a/nixpkgs/pkgs/development/libraries/libvterm-neovim/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libvterm-neovim/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation {
   pname = "libvterm-neovim";
-  version = "2018-11-26";
+  version = "2019-08-28";
 
   src = fetchFromGitHub {
     owner = "neovim";
     repo = "libvterm";
-    rev = "f600f523545b7d4018ebf320e3273795dbe43c8a";
-    sha256 = "08lxd8xs9cg4axgq6bkb7afjxg3s29s1a3niqqm4wjb7iyi2jx5b";
+    rev = "1aa95e24d8f07a396aa80b7cd52f93e2b5bcca79";
+    sha256 = "0vjd397lqrfv4kc79i5izva4bynbymx3gllkg281fnk0b15vxfif";
   };
 
   buildInputs = [ perl ];
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
     description = "VT220/xterm/ECMA-48 terminal emulator library";
     homepage = http://www.leonerd.org.uk/code/libvterm/;
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ rvolosatovs ];
     platforms = platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/mimalloc/default.nix b/nixpkgs/pkgs/development/libraries/mimalloc/default.nix
new file mode 100644
index 000000000000..728b41176766
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/mimalloc/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchFromGitHub, cmake
+, secureBuild ? true
+}:
+
+let
+  soext = stdenv.hostPlatform.extensions.sharedLibrary;
+in
+stdenv.mkDerivation rec {
+  name    = "mimalloc-${version}";
+  version = "1.0.8";
+
+  src = fetchFromGitHub {
+    owner  = "microsoft";
+    repo   = "mimalloc";
+    rev    = "refs/tags/v${version}";
+    sha256 = "04k2d3x84q2jfqdjxngy98hlw6czmigsqlf7gi3mhs6682n127r5";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  enableParallelBuilding = true;
+
+  cmakeFlags = stdenv.lib.optional secureBuild [ "-DMI_SECURE=ON" ];
+
+  postInstall = ''
+    mkdir -p $dev
+    mv $out/lib/*/include $dev/include
+
+    rm -f $out/lib/libmimalloc*${soext} # weird duplicate
+
+    mv $out/lib/*/libmimalloc*${soext} $out/lib/libmimalloc${soext}
+    mv $out/lib/*/libmimalloc*.a       $out/lib/libmimalloc.a
+    mv $out/lib/*/mimalloc*.o          $out/lib/mimalloc.o
+
+    rm -rf $out/lib/mimalloc-*
+  '';
+
+  outputs = [ "out" "dev" ];
+
+  meta = with stdenv.lib; {
+    description = "Compact, fast, general-purpose memory allocator";
+    homepage    = "https://github.com/microsoft/mimalloc";
+    license     = licenses.bsd2;
+    platforms   = platforms.unix;
+    maintainers = with maintainers; [ thoughtpolice ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/libraries/mono-zeroconf/default.nix b/nixpkgs/pkgs/development/libraries/mono-zeroconf/default.nix
deleted file mode 100644
index 89db7344f995..000000000000
--- a/nixpkgs/pkgs/development/libraries/mono-zeroconf/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, which, pkgconfig, mono }:
-
-stdenv.mkDerivation rec {
-  pname = "mono-zeroconf";
-  version = "0.9.0";
-
-  src = fetchurl {
-    url = "http://download.banshee-project.org/mono-zeroconf/mono-zeroconf-${version}.tar.bz2";
-    sha256 = "1qfp4qvsx7rc2shj1chi2y7fxn10rwi70rw2y54b2i8a4jq7gpkb";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ which mono ];
-
-  dontStrip = true;
-
-  configureFlags = [ "--disable-docs" ];
-
-  meta = with stdenv.lib; {
-    description = "A cross platform Zero Configuration Networking library for Mono and .NET";
-    homepage = https://www.mono-project.com/archived/monozeroconf/;
-    platforms = platforms.linux;
-    license = licenses.mit;
-  };
-}
diff --git a/nixpkgs/pkgs/development/libraries/qhull/default.nix b/nixpkgs/pkgs/development/libraries/qhull/default.nix
index 92f927ee3985..323171212be6 100644
--- a/nixpkgs/pkgs/development/libraries/qhull/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qhull/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     homepage = http://www.qhull.org/;
     description = "Compute the convex hull, Delaunay triangulation, Voronoi diagram and more";
-    license = licenses.free;
+    license = licenses.qhull;
     platforms = platforms.unix;
     maintainers = with maintainers; [ orivej ];
   };
diff --git a/nixpkgs/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh b/nixpkgs/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh
index d7a44cace036..d2aadbd956a8 100644
--- a/nixpkgs/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh
+++ b/nixpkgs/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh
@@ -80,7 +80,7 @@ wrapQtAppsHook() {
     do
         [ -d "$targetDir" ] || continue
 
-        find "$targetDir" -type f -executable -print0 | while IFS= read -r -d '' file
+        find "$targetDir" ! -type d -executable -print0 | while IFS= read -r -d '' file
         do
             patchelf --print-interpreter "$file" >/dev/null 2>&1 || continue
 
diff --git a/nixpkgs/pkgs/development/libraries/science/networking/ns3/default.nix b/nixpkgs/pkgs/development/libraries/science/networking/ns-3/default.nix
index 5218de075093..73be2a8ca6c2 100644
--- a/nixpkgs/pkgs/development/libraries/science/networking/ns3/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/networking/ns-3/default.nix
@@ -1,5 +1,5 @@
 { stdenv
-, fetchFromGitHub
+, fetchFromGitLab
 , python
 , wafHook
 
@@ -22,75 +22,89 @@
 , dia, tetex ? null, ghostscript ? null, texlive ? null
 
 # generates python bindings
-, generateBindings ? false, ncurses ? null
+, pythonSupport ? false, ncurses ? null
 
 # All modules can be enabled by choosing 'all_modules'.
 # we include here the DCE mandatory ones
 , modules ? [ "core" "network" "internet" "point-to-point" "fd-net-device" "netanim"]
-, gcc6
 , lib
 }:
 
 let
   pythonEnv = python.withPackages(ps:
     stdenv.lib.optional withManual ps.sphinx
-    ++ stdenv.lib.optionals generateBindings (with ps;[ pybindgen pygccxml ])
+    ++ stdenv.lib.optionals pythonSupport (with ps;[ pybindgen pygccxml ])
   );
 in
 stdenv.mkDerivation rec {
-
-  name = "ns-3.${version}";
-  version = "28";
-
-  # the all in one https://www.nsnam.org/release/ns-allinone-3.27.tar.bz2;
-  # fetches everything (netanim, etc), this package focuses on ns3-core
-  src = fetchFromGitHub {
-    owner  = "nsnam";
-    repo   = "ns-3-dev-git";
-    rev    = name;
-    sha256 = "17kzfjpgw2mvyx1c9bxccnvw67jpk09fxmcnlkqx9xisk10qnhng";
+  pname = "ns-3";
+  version = "30";
+
+  src = fetchFromGitLab {
+    owner = "nsnam";
+    repo   = "ns-3-dev";
+    rev    = "ns-3.${version}";
+    sha256 = "0smdi3gglmafpc7a20hj2lbmwks3d5fpsicpn39lmm3svazw0bvp";
   };
 
   nativeBuildInputs = [ wafHook ];
+
+  outputs = [ "out" ] ++ lib.optional pythonSupport "py";
+
   # ncurses is a hidden dependency of waf when checking python
-  buildInputs = lib.optionals generateBindings [ castxml ncurses ]
-    ++ stdenv.lib.optional enableDoxygen [ doxygen graphviz imagemagick ]
-    ++ stdenv.lib.optional withManual [ dia tetex ghostscript texlive.combined.scheme-medium ];
+  buildInputs = lib.optionals pythonSupport [ castxml ncurses ]
+    ++ lib.optional enableDoxygen [ doxygen graphviz imagemagick ]
+    ++ lib.optional withManual [ dia tetex ghostscript texlive.combined.scheme-medium ];
 
-  propagatedBuildInputs = [ gcc6 pythonEnv ];
+  propagatedBuildInputs = [ pythonEnv ];
 
   postPatch = ''
     patchShebangs doc/ns3_html_theme/get_version.sh
   '';
 
   wafConfigureFlags = with stdenv.lib; [
-      "--enable-modules=${stdenv.lib.concatStringsSep "," modules}"
+      "--enable-modules=${concatStringsSep "," modules}"
       "--with-python=${pythonEnv.interpreter}"
   ]
   ++ optional (build_profile != null) "--build-profile=${build_profile}"
-  ++ optional generateBindings [  ]
   ++ optional withExamples " --enable-examples "
   ++ optional doCheck " --enable-tests "
   ;
 
+  doCheck = true;
+
   buildTargets = "build"
     + lib.optionalString enableDoxygen " doxygen"
     + lib.optionalString withManual "sphinx";
 
-  doCheck = true;
+  # to prevent fatal error: 'backward_warning.h' file not found
+  CXXFLAGS = "-D_GLIBCXX_PERMIT_BACKWARD_HASH";
+
+  postBuild = with stdenv.lib; let flags = concatStringsSep ";" (
+      optional enableDoxygen "./waf doxygen"
+      ++ optional withManual "./waf sphinx"
+    );
+    in "${flags}"
+  ;
+
+  postInstall = ''
+    moveToOutput "${pythonEnv.libPrefix}" "$py"
+  '';
 
   # we need to specify the proper interpreter else ns3 can check against a
-  # different version even though we
+  # different version
   checkPhase =  ''
-    ${pythonEnv.interpreter} ./test.py
+    ${pythonEnv.interpreter} ./test.py --nowaf
   '';
 
-  hardeningDisable = [ "fortify" ];
+  # strictoverflow prevents clang from discovering pyembed when bindings
+  hardeningDisable = [ "fortify" "strictoverflow"];
 
-  meta = {
-    homepage = http://www.nsnam.org;
-    license = stdenv.lib.licenses.gpl3;
+  meta = with stdenv.lib; {
+    homepage = "http://www.nsnam.org";
+    license = licenses.gpl3;
     description = "A discrete time event network simulator";
-    platforms = with stdenv.lib.platforms; unix;
+    platforms = with platforms; unix;
+    maintainers = with maintainers; [ teto ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/vtk/default.nix b/nixpkgs/pkgs/development/libraries/vtk/default.nix
index c0b8fd7d1679..3cb8998485a9 100644
--- a/nixpkgs/pkgs/development/libraries/vtk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vtk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, libGLU_combined, libX11, xorgproto, libXt
+{ stdenv, fetchurl, cmake, libGLU_combined, libX11, xorgproto, libXt, libtiff
 , qtLib ? null
 # Darwin support
 , Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL
@@ -20,7 +20,9 @@ stdenv.mkDerivation rec {
     sha256 = "0nm7xwwj7rnsxjdv2ssviys8nhci4n9iiiqm2y14s520hl2dsp1d";
   };
 
-  buildInputs = [ cmake ]
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [ libtiff ]
     ++ optional (qtLib != null) qtLib
     ++ optionals stdenv.isLinux [ libGLU_combined libX11 xorgproto libXt ]
     ++ optionals stdenv.isDarwin [ xpc Cocoa CoreServices DiskArbitration IOKit
@@ -38,7 +40,7 @@ stdenv.mkDerivation rec {
   # built and requiring one of the shared objects.
   # At least, we use -fPIC for other packages to be able to use this in shared
   # objects.
-  cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" ]
+  cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" "-DVTK_USE_SYSTEM_TIFF=1" ]
     ++ optional (qtLib != null) [ "-DVTK_USE_QT:BOOL=ON" ]
     ++ optional stdenv.isDarwin "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks";
 
diff --git a/nixpkgs/pkgs/development/libraries/yubico-pam/default.nix b/nixpkgs/pkgs/development/libraries/yubico-pam/default.nix
index 5d7d0e664c64..e6a3fa9fbe14 100644
--- a/nixpkgs/pkgs/development/libraries/yubico-pam/default.nix
+++ b/nixpkgs/pkgs/development/libraries/yubico-pam/default.nix
@@ -4,12 +4,12 @@
 
 stdenv.mkDerivation rec {
   pname = "yubico-pam";
-  version = "unstable-2019-03-19";
+  version = "unstable-2019-07-01";
   src = fetchFromGitHub {
     owner = "Yubico";
     repo = pname;
-    rev = "1c6fa66825e77b3ad8df46513d0125bed9bde704";
-    sha256 = "1g41wdwa1wbp391w1crbis4hwz60m3y06rd6j59m003zx40sk9s4";
+    rev = "b5bd00db81e0e0e0ecced65c684080bb56ddc35b";
+    sha256 = "10dq8dqi3jldllj6p8r9hldx9sank9n82c44w8akxrs1vli6nj3m";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig asciidoc libxslt docbook_xsl ];
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
index 586502945ba6..15b907e341e9 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 {
   baseName = ''alexandria'';
-  version = ''20181210-git'';
+  version = ''20190710-git'';
 
   description = ''Alexandria is a collection of portable public domain utilities.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/alexandria/2018-12-10/alexandria-20181210-git.tgz'';
-    sha256 = ''0dg0gr7cgrrl70sq0sbz8i1zcli54bqg4x532wscz3156xrl2588'';
+    url = ''http://beta.quicklisp.org/archive/alexandria/2019-07-10/alexandria-20190710-git.tgz'';
+    sha256 = ''0127d5yyq46dpffvr4hla6d3ryiml48mxd2r6cgbg3mgz3b2nr70'';
   };
 
   packageName = "alexandria";
@@ -19,8 +19,8 @@ args @ { fetchurl, ... }:
 }
 /* (SYSTEM alexandria DESCRIPTION
     Alexandria is a collection of portable public domain utilities. SHA256
-    0dg0gr7cgrrl70sq0sbz8i1zcli54bqg4x532wscz3156xrl2588 URL
-    http://beta.quicklisp.org/archive/alexandria/2018-12-10/alexandria-20181210-git.tgz
-    MD5 2a7530a412cd94a56b6d4e5864fb8819 NAME alexandria FILENAME alexandria
-    DEPS NIL DEPENDENCIES NIL VERSION 20181210-git SIBLINGS (alexandria-tests)
+    0127d5yyq46dpffvr4hla6d3ryiml48mxd2r6cgbg3mgz3b2nr70 URL
+    http://beta.quicklisp.org/archive/alexandria/2019-07-10/alexandria-20190710-git.tgz
+    MD5 2b5abc0a266aeafe9029bf26db90b292 NAME alexandria FILENAME alexandria
+    DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS (alexandria-tests)
     PARASITES NIL) */
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
index 1d64784a0a64..988b247482b6 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 {
   baseName = ''array-utils'';
-  version = ''20181018-git'';
+  version = ''20190710-git'';
 
   description = ''A few utilities for working with arrays.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/array-utils/2018-10-18/array-utils-20181018-git.tgz'';
-    sha256 = ''1w13zwdhms4xbsnp9p6j71a4ppzglhxm81savyq0spf3zlm2l5yn'';
+    url = ''http://beta.quicklisp.org/archive/array-utils/2019-07-10/array-utils-20190710-git.tgz'';
+    sha256 = ''1fzsg3lqa79yrkad6fx924vai7i6m92i2rq8lyq37wrbwkhm7grh'';
   };
 
   packageName = "array-utils";
@@ -18,8 +18,8 @@ args @ { fetchurl, ... }:
   overrides = x: x;
 }
 /* (SYSTEM array-utils DESCRIPTION A few utilities for working with arrays.
-    SHA256 1w13zwdhms4xbsnp9p6j71a4ppzglhxm81savyq0spf3zlm2l5yn URL
-    http://beta.quicklisp.org/archive/array-utils/2018-10-18/array-utils-20181018-git.tgz
-    MD5 e32cc0474cf299ad1f5666e2864aa3d8 NAME array-utils FILENAME array-utils
-    DEPS NIL DEPENDENCIES NIL VERSION 20181018-git SIBLINGS (array-utils-test)
+    SHA256 1fzsg3lqa79yrkad6fx924vai7i6m92i2rq8lyq37wrbwkhm7grh URL
+    http://beta.quicklisp.org/archive/array-utils/2019-07-10/array-utils-20190710-git.tgz
+    MD5 58c39c2ba3d2c8cd8a695fb867b72c33 NAME array-utils FILENAME array-utils
+    DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS (array-utils-test)
     PARASITES NIL) */
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-package-system.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-package-system.nix
new file mode 100644
index 000000000000..1a56676f0363
--- /dev/null
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-package-system.nix
@@ -0,0 +1,25 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''asdf-package-system'';
+  version = ''20150608-git'';
+
+  description = ''System lacks description'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/asdf-package-system/2015-06-08/asdf-package-system-20150608-git.tgz'';
+    sha256 = ''17lfwfc15hcag8a2jsaxkx42wmz2mwkvxf6vb2h9cim7dwsnyy29'';
+  };
+
+  packageName = "asdf-package-system";
+
+  asdFilesToKeep = ["asdf-package-system.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM asdf-package-system DESCRIPTION System lacks description SHA256
+    17lfwfc15hcag8a2jsaxkx42wmz2mwkvxf6vb2h9cim7dwsnyy29 URL
+    http://beta.quicklisp.org/archive/asdf-package-system/2015-06-08/asdf-package-system-20150608-git.tgz
+    MD5 9eee9d811aec4894843ac1d8ae6cbccd NAME asdf-package-system FILENAME
+    asdf-package-system DEPS NIL DEPENDENCIES NIL VERSION 20150608-git SIBLINGS
+    NIL PARASITES NIL) */
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
index 3209735adb59..365ae1d6ef65 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
@@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
   baseName = ''chunga'';
   version = ''20180131-git'';
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ args."trivial-gray-streams" ];
 
@@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
   asdFilesToKeep = ["chunga.asd"];
   overrides = x: x;
 }
-/* (SYSTEM chunga DESCRIPTION NIL SHA256
+/* (SYSTEM chunga DESCRIPTION System lacks description SHA256
     0crlv6n6al7j9b40dpfjd13870ih5hzwra29xxfg3zg2zy2kdnrq URL
     http://beta.quicklisp.org/archive/chunga/2018-01-31/chunga-20180131-git.tgz
     MD5 044b684535b11b1eee1cf939bec6e14a NAME chunga FILENAME chunga DEPS
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix
new file mode 100644
index 000000000000..ba295b6e43a6
--- /dev/null
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix
@@ -0,0 +1,24 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-css'';
+  version = ''20140914-git'';
+
+  description = ''Simple inline CSS generator'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-css/2014-09-14/cl-css-20140914-git.tgz'';
+    sha256 = ''16zjm10qqyv5v0ysvicbiscplrwlfr0assbf01gp73j1m108rn7n'';
+  };
+
+  packageName = "cl-css";
+
+  asdFilesToKeep = ["cl-css.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM cl-css DESCRIPTION Simple inline CSS generator SHA256
+    16zjm10qqyv5v0ysvicbiscplrwlfr0assbf01gp73j1m108rn7n URL
+    http://beta.quicklisp.org/archive/cl-css/2014-09-14/cl-css-20140914-git.tgz
+    MD5 a91f5a5d6a751af31d5c4fd8170f6ece NAME cl-css FILENAME cl-css DEPS NIL
+    DEPENDENCIES NIL VERSION 20140914-git SIBLINGS NIL PARASITES NIL) */
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
index 7a1b7d9f8639..f495d7b4c82a 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
@@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
   baseName = ''cl-dbi'';
   version = ''20190521-git'';
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."named-readtables" args."split-sequence" args."trivial-types" ];
 
@@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
   asdFilesToKeep = ["cl-dbi.asd"];
   overrides = x: x;
 }
-/* (SYSTEM cl-dbi DESCRIPTION NIL SHA256
+/* (SYSTEM cl-dbi DESCRIPTION System lacks description SHA256
     1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg URL
     http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz
     MD5 ba77d3a955991b406f56cc1a09e71dc2 NAME cl-dbi FILENAME cl-dbi DEPS
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
index b04a6cd83444..81b9153fff03 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
@@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
   baseName = ''cl-test-more'';
   version = ''prove-20171130-git'';
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-ppcre" args."let-plus" args."prove" ];
 
@@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
   asdFilesToKeep = ["cl-test-more.asd"];
   overrides = x: x;
 }
-/* (SYSTEM cl-test-more DESCRIPTION NIL SHA256
+/* (SYSTEM cl-test-more DESCRIPTION System lacks description SHA256
     13dmnnlk3r9fxxcvk6sqq8m0ifv9y80zgp1wg63nv1ykwdi7kyar URL
     http://beta.quicklisp.org/archive/prove/2017-11-30/prove-20171130-git.tgz
     MD5 630df4367537f799570be40242f8ed52 NAME cl-test-more FILENAME
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
index 4999da6d0b69..4ccd82f2ccc7 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
@@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
   baseName = ''cl-utilities'';
   version = ''1.2.4'';
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ ];
 
@@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
   asdFilesToKeep = ["cl-utilities.asd"];
   overrides = x: x;
 }
-/* (SYSTEM cl-utilities DESCRIPTION NIL SHA256
+/* (SYSTEM cl-utilities DESCRIPTION System lacks description SHA256
     1z2ippnv2wgyxpz15zpif7j7sp1r20fkjhm4n6am2fyp6a3k3a87 URL
     http://beta.quicklisp.org/archive/cl-utilities/2010-10-06/cl-utilities-1.2.4.tgz
     MD5 c3a4ba38b627448d3ed40ce888048940 NAME cl-utilities FILENAME
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-xmlspam.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-xmlspam.nix
new file mode 100644
index 000000000000..223c50f47164
--- /dev/null
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-xmlspam.nix
@@ -0,0 +1,34 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-xmlspam'';
+  version = ''20101006-http'';
+
+  description = ''Streaming pattern matching for XML'';
+
+  deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."puri" args."trivial-features" args."trivial-gray-streams" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-xmlspam/2010-10-06/cl-xmlspam-20101006-http.tgz'';
+    sha256 = ''1mx1a6ab4irncrx5pamh7zng35m4c5wh0pw68avaz7fbz81s953h'';
+  };
+
+  packageName = "cl-xmlspam";
+
+  asdFilesToKeep = ["cl-xmlspam.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM cl-xmlspam DESCRIPTION Streaming pattern matching for XML SHA256
+    1mx1a6ab4irncrx5pamh7zng35m4c5wh0pw68avaz7fbz81s953h URL
+    http://beta.quicklisp.org/archive/cl-xmlspam/2010-10-06/cl-xmlspam-20101006-http.tgz
+    MD5 6e3a0944e96e17916b1445f4207babb8 NAME cl-xmlspam FILENAME cl-xmlspam
+    DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME closure-common FILENAME closure-common) (NAME cxml FILENAME cxml)
+     (NAME puri FILENAME puri)
+     (NAME trivial-features FILENAME trivial-features)
+     (NAME trivial-gray-streams FILENAME trivial-gray-streams))
+    DEPENDENCIES
+    (alexandria babel cl-ppcre closure-common cxml puri trivial-features
+     trivial-gray-streams)
+    VERSION 20101006-http SIBLINGS NIL PARASITES NIL) */
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
index 5f4a96dbcc4a..4dcda09baeac 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
@@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
   baseName = ''clack-socket'';
   version = ''clack-20190710-git'';
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ ];
 
@@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
   asdFilesToKeep = ["clack-socket.asd"];
   overrides = x: x;
 }
-/* (SYSTEM clack-socket DESCRIPTION NIL SHA256
+/* (SYSTEM clack-socket DESCRIPTION System lacks description SHA256
     1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k URL
     http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz
     MD5 9d8869ca599652d68dd759c8a6adcd3d NAME clack-socket FILENAME
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
index 0234f7644988..8f2a19519ac1 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
@@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
   baseName = ''clack-v1-compat'';
   version = ''clack-20190710-git'';
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."dexador" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."marshal" args."md5" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."rfc2388" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."uiop" args."usocket" args."xsubseq" ];
 
@@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
   asdFilesToKeep = ["clack-v1-compat.asd"];
   overrides = x: x;
 }
-/* (SYSTEM clack-v1-compat DESCRIPTION NIL SHA256
+/* (SYSTEM clack-v1-compat DESCRIPTION System lacks description SHA256
     1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k URL
     http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz
     MD5 9d8869ca599652d68dd759c8a6adcd3d NAME clack-v1-compat FILENAME
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix
index 2746ccff6c9c..7df1e251ece9 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix
@@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
   baseName = ''closure-html'';
   version = ''20180711-git'';
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ args."alexandria" args."babel" args."closure-common" args."flexi-streams" args."trivial-features" args."trivial-gray-streams" ];
 
@@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
   asdFilesToKeep = ["closure-html.asd"];
   overrides = x: x;
 }
-/* (SYSTEM closure-html DESCRIPTION NIL SHA256
+/* (SYSTEM closure-html DESCRIPTION System lacks description SHA256
     0ljcrz1wix77h1ywp0bixm3pb5ncmr1vdiwh8m1qzkygwpfjr8aq URL
     http://beta.quicklisp.org/archive/closure-html/2018-07-11/closure-html-20180711-git.tgz
     MD5 461dc8caa65385da5f2d1cd8dd4f965f NAME closure-html FILENAME
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
index 0dd93c46fb2f..c1c209093d0a 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
@@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
   baseName = ''css-lite'';
   version = ''20120407-git'';
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ ];
 
@@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
   asdFilesToKeep = ["css-lite.asd"];
   overrides = x: x;
 }
-/* (SYSTEM css-lite DESCRIPTION NIL SHA256
+/* (SYSTEM css-lite DESCRIPTION System lacks description SHA256
     1gf1qqaxhly6ixh9ykqhg9b52s8p5wlwi46vp2k29qy7gmx4f1qg URL
     http://beta.quicklisp.org/archive/css-lite/2012-04-07/css-lite-20120407-git.tgz
     MD5 9b25afb0d2c3f0c32d2303ab1d3f570d NAME css-lite FILENAME css-lite DEPS
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix
new file mode 100644
index 000000000000..5043ff2e2613
--- /dev/null
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix
@@ -0,0 +1,34 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''dbus'';
+  version = ''20190521-git'';
+
+  description = ''A D-BUS client library for Common Lisp'';
+
+  deps = [ args."alexandria" args."asdf-package-system" args."babel" args."cl-xmlspam" args."flexi-streams" args."ieee-floats" args."iolib" args."ironclad" args."trivial-garbage" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/dbus/2019-05-21/dbus-20190521-git.tgz'';
+    sha256 = ''0g4hsygy52rylhi19kxxhv9dbbirl6hdisgqw89whdxb9py6ifqq'';
+  };
+
+  packageName = "dbus";
+
+  asdFilesToKeep = ["dbus.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM dbus DESCRIPTION A D-BUS client library for Common Lisp SHA256
+    0g4hsygy52rylhi19kxxhv9dbbirl6hdisgqw89whdxb9py6ifqq URL
+    http://beta.quicklisp.org/archive/dbus/2019-05-21/dbus-20190521-git.tgz MD5
+    59e7ab92086503e4185273ec3f3ba3fc NAME dbus FILENAME dbus DEPS
+    ((NAME alexandria FILENAME alexandria)
+     (NAME asdf-package-system FILENAME asdf-package-system)
+     (NAME babel FILENAME babel) (NAME cl-xmlspam FILENAME cl-xmlspam)
+     (NAME flexi-streams FILENAME flexi-streams)
+     (NAME ieee-floats FILENAME ieee-floats) (NAME iolib FILENAME iolib)
+     (NAME ironclad FILENAME ironclad)
+     (NAME trivial-garbage FILENAME trivial-garbage))
+    DEPENDENCIES
+    (alexandria asdf-package-system babel cl-xmlspam flexi-streams ieee-floats
+     iolib ironclad trivial-garbage)
+    VERSION 20190521-git SIBLINGS NIL PARASITES NIL) */
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
index b247ea27298d..adecbd142d37 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
@@ -5,7 +5,7 @@ args @ { fetchurl, ... }:
 
   parasites = [ "external-program-test" ];
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ args."fiveam" args."trivial-features" ];
 
@@ -19,7 +19,7 @@ args @ { fetchurl, ... }:
   asdFilesToKeep = ["external-program.asd"];
   overrides = x: x;
 }
-/* (SYSTEM external-program DESCRIPTION NIL SHA256
+/* (SYSTEM external-program DESCRIPTION System lacks description SHA256
     1nl3mngh7vp2l9mfbdhni4nc164zznafnl74p1kv9j07n5fcpnyz URL
     http://beta.quicklisp.org/archive/external-program/2019-03-07/external-program-20190307-git.tgz
     MD5 b30fe104c34059506fd4c493fa79fe1a NAME external-program FILENAME
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/introspect-environment.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/introspect-environment.nix
new file mode 100644
index 000000000000..1677e5adcde7
--- /dev/null
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/introspect-environment.nix
@@ -0,0 +1,26 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''introspect-environment'';
+  version = ''20151031-git'';
+
+  description = ''Small interface to portable but nonstandard introspection of CL environments.'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/introspect-environment/2015-10-31/introspect-environment-20151031-git.tgz'';
+    sha256 = ''0npydsmksbm3nisy9whnivmmhgdira74plmncmaklp7yhqsvwc30'';
+  };
+
+  packageName = "introspect-environment";
+
+  asdFilesToKeep = ["introspect-environment.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM introspect-environment DESCRIPTION
+    Small interface to portable but nonstandard introspection of CL environments.
+    SHA256 0npydsmksbm3nisy9whnivmmhgdira74plmncmaklp7yhqsvwc30 URL
+    http://beta.quicklisp.org/archive/introspect-environment/2015-10-31/introspect-environment-20151031-git.tgz
+    MD5 3c61088583f11791530edb2e18f5d6f0 NAME introspect-environment FILENAME
+    introspect-environment DEPS NIL DEPENDENCIES NIL VERSION 20151031-git
+    SIBLINGS (introspect-environment-test) PARASITES NIL) */
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
index cdac924b4396..c94277bb2114 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
@@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
   baseName = ''lack-component'';
   version = ''lack-20190521-git'';
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ ];
 
@@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
   asdFilesToKeep = ["lack-component.asd"];
   overrides = x: x;
 }
-/* (SYSTEM lack-component DESCRIPTION NIL SHA256
+/* (SYSTEM lack-component DESCRIPTION System lacks description SHA256
     0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593 URL
     http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz MD5
     7d7321550f0795e998c7afe4498e7a40 NAME lack-component FILENAME
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
index 68604485c77a..3fc76c73576a 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
@@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
   baseName = ''lack-middleware-backtrace'';
   version = ''lack-20190521-git'';
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ args."uiop" ];
 
@@ -17,8 +17,8 @@ args @ { fetchurl, ... }:
   asdFilesToKeep = ["lack-middleware-backtrace.asd"];
   overrides = x: x;
 }
-/* (SYSTEM lack-middleware-backtrace DESCRIPTION NIL SHA256
-    0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593 URL
+/* (SYSTEM lack-middleware-backtrace DESCRIPTION System lacks description
+    SHA256 0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593 URL
     http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz MD5
     7d7321550f0795e998c7afe4498e7a40 NAME lack-middleware-backtrace FILENAME
     lack-middleware-backtrace DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
index cda7716151ab..221ac216cf83 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
@@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
   baseName = ''lack-util'';
   version = ''lack-20190521-git'';
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."nibbles" ];
 
@@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
   asdFilesToKeep = ["lack-util.asd"];
   overrides = x: x;
 }
-/* (SYSTEM lack-util DESCRIPTION NIL SHA256
+/* (SYSTEM lack-util DESCRIPTION System lacks description SHA256
     0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593 URL
     http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz MD5
     7d7321550f0795e998c7afe4498e7a40 NAME lack-util FILENAME lack-util DEPS
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix
new file mode 100644
index 000000000000..aeb37b15a49f
--- /dev/null
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix
@@ -0,0 +1,30 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''log4cl'';
+  version = ''20190107-git'';
+
+  parasites = [ "log4cl/syslog" "log4cl/test" ];
+
+  description = ''System lacks description'';
+
+  deps = [ args."alexandria" args."bordeaux-threads" args."stefil" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/log4cl/2019-01-07/log4cl-20190107-git.tgz'';
+    sha256 = ''0c5gsmz69jby5hmcl4igf1sh6xkwh8bx2jz6kd2gcnqjwq37h46p'';
+  };
+
+  packageName = "log4cl";
+
+  asdFilesToKeep = ["log4cl.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM log4cl DESCRIPTION System lacks description SHA256
+    0c5gsmz69jby5hmcl4igf1sh6xkwh8bx2jz6kd2gcnqjwq37h46p URL
+    http://beta.quicklisp.org/archive/log4cl/2019-01-07/log4cl-20190107-git.tgz
+    MD5 ecfa1f67902c776f46d192acd55f628c NAME log4cl FILENAME log4cl DEPS
+    ((NAME alexandria FILENAME alexandria)
+     (NAME bordeaux-threads FILENAME bordeaux-threads)
+     (NAME stefil FILENAME stefil))
+    DEPENDENCIES (alexandria bordeaux-threads stefil) VERSION 20190107-git
+    SIBLINGS (log4cl-examples log4slime) PARASITES (log4cl/syslog log4cl/test)) */
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
index ef0da68cfe4d..13d0b971d44b 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
@@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
   baseName = ''misc-extensions'';
   version = ''20150608-git'';
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ ];
 
@@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
   asdFilesToKeep = ["misc-extensions.asd"];
   overrides = x: x;
 }
-/* (SYSTEM misc-extensions DESCRIPTION NIL SHA256
+/* (SYSTEM misc-extensions DESCRIPTION System lacks description SHA256
     0pkvi1l5djwpvm0p8m0bcdjm61gxvzy0vgn415gngdixvbbchdqj URL
     http://beta.quicklisp.org/archive/misc-extensions/2015-06-08/misc-extensions-20150608-git.tgz
     MD5 ef8a05dd4382bb9d1e3960aeb77e332e NAME misc-extensions FILENAME
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mk-string-metrics.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mk-string-metrics.nix
new file mode 100644
index 000000000000..dc63474679a9
--- /dev/null
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mk-string-metrics.nix
@@ -0,0 +1,26 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''mk-string-metrics'';
+  version = ''20180131-git'';
+
+  description = ''efficient implementations of various string metric algorithms'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/mk-string-metrics/2018-01-31/mk-string-metrics-20180131-git.tgz'';
+    sha256 = ''10xb9n6568nh019nq3phijbc7l6hkv69yllfiqvc1zzsprxpkwc4'';
+  };
+
+  packageName = "mk-string-metrics";
+
+  asdFilesToKeep = ["mk-string-metrics.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM mk-string-metrics DESCRIPTION
+    efficient implementations of various string metric algorithms SHA256
+    10xb9n6568nh019nq3phijbc7l6hkv69yllfiqvc1zzsprxpkwc4 URL
+    http://beta.quicklisp.org/archive/mk-string-metrics/2018-01-31/mk-string-metrics-20180131-git.tgz
+    MD5 40f23794a7d841cb178f5951d3992886 NAME mk-string-metrics FILENAME
+    mk-string-metrics DEPS NIL DEPENDENCIES NIL VERSION 20180131-git SIBLINGS
+    (mk-string-metrics-tests) PARASITES NIL) */
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
index 60385ab59393..c041d1778fac 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
@@ -5,7 +5,7 @@ args @ { fetchurl, ... }:
 
   parasites = [ "pcall-tests" ];
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ args."alexandria" args."bordeaux-threads" args."fiveam" args."pcall-queue" ];
 
@@ -19,7 +19,7 @@ args @ { fetchurl, ... }:
   asdFilesToKeep = ["pcall.asd"];
   overrides = x: x;
 }
-/* (SYSTEM pcall DESCRIPTION NIL SHA256
+/* (SYSTEM pcall DESCRIPTION System lacks description SHA256
     02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y URL
     http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz MD5
     019d85dfd1d5d0ee8d4ee475411caf6b NAME pcall FILENAME pcall DEPS
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove-asdf.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove-asdf.nix
new file mode 100644
index 000000000000..583b30f9769e
--- /dev/null
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove-asdf.nix
@@ -0,0 +1,25 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''prove-asdf'';
+  version = ''prove-20171130-git'';
+
+  description = ''System lacks description'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/prove/2017-11-30/prove-20171130-git.tgz'';
+    sha256 = ''13dmnnlk3r9fxxcvk6sqq8m0ifv9y80zgp1wg63nv1ykwdi7kyar'';
+  };
+
+  packageName = "prove-asdf";
+
+  asdFilesToKeep = ["prove-asdf.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM prove-asdf DESCRIPTION System lacks description SHA256
+    13dmnnlk3r9fxxcvk6sqq8m0ifv9y80zgp1wg63nv1ykwdi7kyar URL
+    http://beta.quicklisp.org/archive/prove/2017-11-30/prove-20171130-git.tgz
+    MD5 630df4367537f799570be40242f8ed52 NAME prove-asdf FILENAME prove-asdf
+    DEPS NIL DEPENDENCIES NIL VERSION prove-20171130-git SIBLINGS
+    (cl-test-more prove-test prove) PARASITES NIL) */
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
index 9bbc47275f80..92ac9e33d499 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
@@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
   baseName = ''prove'';
   version = ''20171130-git'';
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-ppcre" args."let-plus" args."uiop" ];
 
@@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
   asdFilesToKeep = ["prove.asd"];
   overrides = x: x;
 }
-/* (SYSTEM prove DESCRIPTION NIL SHA256
+/* (SYSTEM prove DESCRIPTION System lacks description SHA256
     13dmnnlk3r9fxxcvk6sqq8m0ifv9y80zgp1wg63nv1ykwdi7kyar URL
     http://beta.quicklisp.org/archive/prove/2017-11-30/prove-20171130-git.tgz
     MD5 630df4367537f799570be40242f8ed52 NAME prove FILENAME prove DEPS
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
index f3c1dade8219..7b5f33e7bc22 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
@@ -5,7 +5,7 @@ args @ { fetchurl, ... }:
 
   parasites = [ "simple-date/postgres-glue" "simple-date/tests" ];
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ args."cl-postgres" args."fiveam" args."md5" args."usocket" ];
 
@@ -19,7 +19,7 @@ args @ { fetchurl, ... }:
   asdFilesToKeep = ["simple-date.asd"];
   overrides = x: x;
 }
-/* (SYSTEM simple-date DESCRIPTION NIL SHA256
+/* (SYSTEM simple-date DESCRIPTION System lacks description SHA256
     1vphrizbhbs3r5rq4b8dh4149bz11h5xxilragwf4l2i619k3cp5 URL
     http://beta.quicklisp.org/archive/postmodern/2019-05-21/postmodern-20190521-git.tgz
     MD5 102567f386757cd52aca500c0c348d90 NAME simple-date FILENAME simple-date
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix
new file mode 100644
index 000000000000..d4004f3f8b50
--- /dev/null
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix
@@ -0,0 +1,26 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''str'';
+  version = ''cl-20190710-git'';
+
+  description = ''Modern, consistent and terse Common Lisp string manipulation library.'';
+
+  deps = [ args."cl-ppcre" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-str/2019-07-10/cl-str-20190710-git.tgz'';
+    sha256 = ''1mlnrj9g1d7zbpq6c4vhyw0idhvbm55zpzrbc8iiyv0dzijk70l9'';
+  };
+
+  packageName = "str";
+
+  asdFilesToKeep = ["str.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM str DESCRIPTION
+    Modern, consistent and terse Common Lisp string manipulation library.
+    SHA256 1mlnrj9g1d7zbpq6c4vhyw0idhvbm55zpzrbc8iiyv0dzijk70l9 URL
+    http://beta.quicklisp.org/archive/cl-str/2019-07-10/cl-str-20190710-git.tgz
+    MD5 d3c72394ea33291347d8c825c153c143 NAME str FILENAME str DEPS
+    ((NAME cl-ppcre FILENAME cl-ppcre)) DEPENDENCIES (cl-ppcre) VERSION
+    cl-20190710-git SIBLINGS (str.test) PARASITES NIL) */
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix
new file mode 100644
index 000000000000..74c84f0520f2
--- /dev/null
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix
@@ -0,0 +1,44 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''trivia'';
+  version = ''20190710-git'';
+
+  description = ''NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase'';
+
+  deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."iterate" args."lisp-namespace" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz'';
+    sha256 = ''0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic'';
+  };
+
+  packageName = "trivia";
+
+  asdFilesToKeep = ["trivia.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM trivia DESCRIPTION
+    NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase
+    SHA256 0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic URL
+    http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz
+    MD5 f17ca476901eaff8d3e5d32de23b7447 NAME trivia FILENAME trivia DEPS
+    ((NAME alexandria FILENAME alexandria)
+     (NAME closer-mop FILENAME closer-mop)
+     (NAME introspect-environment FILENAME introspect-environment)
+     (NAME iterate FILENAME iterate)
+     (NAME lisp-namespace FILENAME lisp-namespace)
+     (NAME trivia.balland2006 FILENAME trivia_dot_balland2006)
+     (NAME trivia.level0 FILENAME trivia_dot_level0)
+     (NAME trivia.level1 FILENAME trivia_dot_level1)
+     (NAME trivia.level2 FILENAME trivia_dot_level2)
+     (NAME trivia.trivial FILENAME trivia_dot_trivial)
+     (NAME trivial-cltl2 FILENAME trivial-cltl2) (NAME type-i FILENAME type-i))
+    DEPENDENCIES
+    (alexandria closer-mop introspect-environment iterate lisp-namespace
+     trivia.balland2006 trivia.level0 trivia.level1 trivia.level2
+     trivia.trivial trivial-cltl2 type-i)
+    VERSION 20190710-git SIBLINGS
+    (trivia.balland2006 trivia.benchmark trivia.cffi trivia.level0
+     trivia.level1 trivia.level2 trivia.ppcre trivia.quasiquote trivia.test
+     trivia.trivial)
+    PARASITES NIL) */
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix
new file mode 100644
index 000000000000..d1237b5ac261
--- /dev/null
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix
@@ -0,0 +1,43 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''trivia_dot_balland2006'';
+  version = ''trivia-20190710-git'';
+
+  description = ''Optimizer for Trivia based on (Balland 2006)'';
+
+  deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."iterate" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz'';
+    sha256 = ''0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic'';
+  };
+
+  packageName = "trivia.balland2006";
+
+  asdFilesToKeep = ["trivia.balland2006.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM trivia.balland2006 DESCRIPTION
+    Optimizer for Trivia based on (Balland 2006) SHA256
+    0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic URL
+    http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz
+    MD5 f17ca476901eaff8d3e5d32de23b7447 NAME trivia.balland2006 FILENAME
+    trivia_dot_balland2006 DEPS
+    ((NAME alexandria FILENAME alexandria)
+     (NAME closer-mop FILENAME closer-mop)
+     (NAME introspect-environment FILENAME introspect-environment)
+     (NAME iterate FILENAME iterate)
+     (NAME lisp-namespace FILENAME lisp-namespace)
+     (NAME trivia.level0 FILENAME trivia_dot_level0)
+     (NAME trivia.level1 FILENAME trivia_dot_level1)
+     (NAME trivia.level2 FILENAME trivia_dot_level2)
+     (NAME trivia.trivial FILENAME trivia_dot_trivial)
+     (NAME trivial-cltl2 FILENAME trivial-cltl2) (NAME type-i FILENAME type-i))
+    DEPENDENCIES
+    (alexandria closer-mop introspect-environment iterate lisp-namespace
+     trivia.level0 trivia.level1 trivia.level2 trivia.trivial trivial-cltl2
+     type-i)
+    VERSION trivia-20190710-git SIBLINGS
+    (trivia trivia.benchmark trivia.cffi trivia.level0 trivia.level1
+     trivia.level2 trivia.ppcre trivia.quasiquote trivia.test trivia.trivial)
+    PARASITES NIL) */
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix
new file mode 100644
index 000000000000..30f823625373
--- /dev/null
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix
@@ -0,0 +1,29 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''trivia_dot_level0'';
+  version = ''trivia-20190710-git'';
+
+  description = ''Bootstrapping Pattern Matching Library for implementing Trivia'';
+
+  deps = [ args."alexandria" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz'';
+    sha256 = ''0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic'';
+  };
+
+  packageName = "trivia.level0";
+
+  asdFilesToKeep = ["trivia.level0.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM trivia.level0 DESCRIPTION
+    Bootstrapping Pattern Matching Library for implementing Trivia SHA256
+    0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic URL
+    http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz
+    MD5 f17ca476901eaff8d3e5d32de23b7447 NAME trivia.level0 FILENAME
+    trivia_dot_level0 DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES
+    (alexandria) VERSION trivia-20190710-git SIBLINGS
+    (trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.level1
+     trivia.level2 trivia.ppcre trivia.quasiquote trivia.test trivia.trivial)
+    PARASITES NIL) */
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix
new file mode 100644
index 000000000000..13680b8706c8
--- /dev/null
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix
@@ -0,0 +1,31 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''trivia_dot_level1'';
+  version = ''trivia-20190710-git'';
+
+  description = ''Core patterns of Trivia'';
+
+  deps = [ args."alexandria" args."trivia_dot_level0" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz'';
+    sha256 = ''0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic'';
+  };
+
+  packageName = "trivia.level1";
+
+  asdFilesToKeep = ["trivia.level1.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM trivia.level1 DESCRIPTION Core patterns of Trivia SHA256
+    0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic URL
+    http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz
+    MD5 f17ca476901eaff8d3e5d32de23b7447 NAME trivia.level1 FILENAME
+    trivia_dot_level1 DEPS
+    ((NAME alexandria FILENAME alexandria)
+     (NAME trivia.level0 FILENAME trivia_dot_level0))
+    DEPENDENCIES (alexandria trivia.level0) VERSION trivia-20190710-git
+    SIBLINGS
+    (trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.level0
+     trivia.level2 trivia.ppcre trivia.quasiquote trivia.test trivia.trivial)
+    PARASITES NIL) */
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix
new file mode 100644
index 000000000000..acbcd0b31ecb
--- /dev/null
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix
@@ -0,0 +1,38 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''trivia_dot_level2'';
+  version = ''trivia-20190710-git'';
+
+  description = ''NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase'';
+
+  deps = [ args."alexandria" args."closer-mop" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivial-cltl2" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz'';
+    sha256 = ''0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic'';
+  };
+
+  packageName = "trivia.level2";
+
+  asdFilesToKeep = ["trivia.level2.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM trivia.level2 DESCRIPTION
+    NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase
+    SHA256 0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic URL
+    http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz
+    MD5 f17ca476901eaff8d3e5d32de23b7447 NAME trivia.level2 FILENAME
+    trivia_dot_level2 DEPS
+    ((NAME alexandria FILENAME alexandria)
+     (NAME closer-mop FILENAME closer-mop)
+     (NAME lisp-namespace FILENAME lisp-namespace)
+     (NAME trivia.level0 FILENAME trivia_dot_level0)
+     (NAME trivia.level1 FILENAME trivia_dot_level1)
+     (NAME trivial-cltl2 FILENAME trivial-cltl2))
+    DEPENDENCIES
+    (alexandria closer-mop lisp-namespace trivia.level0 trivia.level1
+     trivial-cltl2)
+    VERSION trivia-20190710-git SIBLINGS
+    (trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.level0
+     trivia.level1 trivia.ppcre trivia.quasiquote trivia.test trivia.trivial)
+    PARASITES NIL) */
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix
new file mode 100644
index 000000000000..b82f6089b06f
--- /dev/null
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix
@@ -0,0 +1,43 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''trivia_dot_trivial'';
+  version = ''trivia-20190710-git'';
+
+  description = ''Base level system of Trivia with a trivial optimizer.
+ Systems that intend to enhance Trivia should depend on this package, not the TRIVIA system,
+ in order to avoid the circular dependency.'';
+
+  deps = [ args."alexandria" args."closer-mop" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivial-cltl2" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz'';
+    sha256 = ''0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic'';
+  };
+
+  packageName = "trivia.trivial";
+
+  asdFilesToKeep = ["trivia.trivial.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM trivia.trivial DESCRIPTION
+    Base level system of Trivia with a trivial optimizer.
+ Systems that intend to enhance Trivia should depend on this package, not the TRIVIA system,
+ in order to avoid the circular dependency.
+    SHA256 0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic URL
+    http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz
+    MD5 f17ca476901eaff8d3e5d32de23b7447 NAME trivia.trivial FILENAME
+    trivia_dot_trivial DEPS
+    ((NAME alexandria FILENAME alexandria)
+     (NAME closer-mop FILENAME closer-mop)
+     (NAME lisp-namespace FILENAME lisp-namespace)
+     (NAME trivia.level0 FILENAME trivia_dot_level0)
+     (NAME trivia.level1 FILENAME trivia_dot_level1)
+     (NAME trivia.level2 FILENAME trivia_dot_level2)
+     (NAME trivial-cltl2 FILENAME trivial-cltl2))
+    DEPENDENCIES
+    (alexandria closer-mop lisp-namespace trivia.level0 trivia.level1
+     trivia.level2 trivial-cltl2)
+    VERSION trivia-20190710-git SIBLINGS
+    (trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.level0
+     trivia.level1 trivia.level2 trivia.ppcre trivia.quasiquote trivia.test)
+    PARASITES NIL) */
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-clipboard.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-clipboard.nix
new file mode 100644
index 000000000000..16d265d465a4
--- /dev/null
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-clipboard.nix
@@ -0,0 +1,26 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''trivial-clipboard'';
+  version = ''20190202-git'';
+
+  description = ''trivial-clipboard let access system clipboard.'';
+
+  deps = [ args."uiop" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/trivial-clipboard/2019-02-02/trivial-clipboard-20190202-git.tgz'';
+    sha256 = ''06ic4lqampxnycz5s0frn7f8fqjpp8mlrnsnlh77gldxlh02pwq1'';
+  };
+
+  packageName = "trivial-clipboard";
+
+  asdFilesToKeep = ["trivial-clipboard.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM trivial-clipboard DESCRIPTION
+    trivial-clipboard let access system clipboard. SHA256
+    06ic4lqampxnycz5s0frn7f8fqjpp8mlrnsnlh77gldxlh02pwq1 URL
+    http://beta.quicklisp.org/archive/trivial-clipboard/2019-02-02/trivial-clipboard-20190202-git.tgz
+    MD5 d9b9ee3754e10888ce243172681a0db2 NAME trivial-clipboard FILENAME
+    trivial-clipboard DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES (uiop)
+    VERSION 20190202-git SIBLINGS (trivial-clipboard-test) PARASITES NIL) */
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-cltl2.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-cltl2.nix
new file mode 100644
index 000000000000..a52420304739
--- /dev/null
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-cltl2.nix
@@ -0,0 +1,26 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''trivial-cltl2'';
+  version = ''20190710-git'';
+
+  description = ''Compatibility package exporting CLtL2 functionality'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/trivial-cltl2/2019-07-10/trivial-cltl2-20190710-git.tgz'';
+    sha256 = ''1qaxwgws8ji6dyh30ff608zpdrplifgkhfdhfnn0367d3rvy11jb'';
+  };
+
+  packageName = "trivial-cltl2";
+
+  asdFilesToKeep = ["trivial-cltl2.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM trivial-cltl2 DESCRIPTION
+    Compatibility package exporting CLtL2 functionality SHA256
+    1qaxwgws8ji6dyh30ff608zpdrplifgkhfdhfnn0367d3rvy11jb URL
+    http://beta.quicklisp.org/archive/trivial-cltl2/2019-07-10/trivial-cltl2-20190710-git.tgz
+    MD5 8114f96b9770a9f0e0a94933918dc171 NAME trivial-cltl2 FILENAME
+    trivial-cltl2 DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS NIL
+    PARASITES NIL) */
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
index 0ac57089e50d..b4282ec33ce1 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
@@ -5,7 +5,7 @@ args @ { fetchurl, ... }:
 
   parasites = [ "trivial-utf-8-tests" ];
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ ];
 
@@ -19,7 +19,7 @@ args @ { fetchurl, ... }:
   asdFilesToKeep = ["trivial-utf-8.asd"];
   overrides = x: x;
 }
-/* (SYSTEM trivial-utf-8 DESCRIPTION NIL SHA256
+/* (SYSTEM trivial-utf-8 DESCRIPTION System lacks description SHA256
     1lmg185s6w3rzsz3xa41k5w9xw32bi288ifhrxincy8iv92w65wb URL
     http://beta.quicklisp.org/archive/trivial-utf-8/2011-10-01/trivial-utf-8-20111001-darcs.tgz
     MD5 0206c4ba7a6c0b9b23762f244aca6614 NAME trivial-utf-8 FILENAME
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix
new file mode 100644
index 000000000000..40e718cc10bf
--- /dev/null
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix
@@ -0,0 +1,37 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''type-i'';
+  version = ''20190521-git'';
+
+  description = ''Type Inference Utility on Fundamentally 1-arg Predicates'';
+
+  deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/type-i/2019-05-21/type-i-20190521-git.tgz'';
+    sha256 = ''1d79g3vd8s387rqagrkf1nmxax6kq32j1ddjrnx7ly08ib6aca99'';
+  };
+
+  packageName = "type-i";
+
+  asdFilesToKeep = ["type-i.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM type-i DESCRIPTION
+    Type Inference Utility on Fundamentally 1-arg Predicates SHA256
+    1d79g3vd8s387rqagrkf1nmxax6kq32j1ddjrnx7ly08ib6aca99 URL
+    http://beta.quicklisp.org/archive/type-i/2019-05-21/type-i-20190521-git.tgz
+    MD5 9906855a0650f93186f37e162429e58b NAME type-i FILENAME type-i DEPS
+    ((NAME alexandria FILENAME alexandria)
+     (NAME closer-mop FILENAME closer-mop)
+     (NAME introspect-environment FILENAME introspect-environment)
+     (NAME lisp-namespace FILENAME lisp-namespace)
+     (NAME trivia.level0 FILENAME trivia_dot_level0)
+     (NAME trivia.level1 FILENAME trivia_dot_level1)
+     (NAME trivia.level2 FILENAME trivia_dot_level2)
+     (NAME trivia.trivial FILENAME trivia_dot_trivial)
+     (NAME trivial-cltl2 FILENAME trivial-cltl2))
+    DEPENDENCIES
+    (alexandria closer-mop introspect-environment lisp-namespace trivia.level0
+     trivia.level1 trivia.level2 trivia.trivial trivial-cltl2)
+    VERSION 20190521-git SIBLINGS (type-i.test) PARASITES NIL) */
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-opts.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-opts.nix
new file mode 100644
index 000000000000..4af27c449a33
--- /dev/null
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-opts.nix
@@ -0,0 +1,25 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''unix-opts'';
+  version = ''20180430-git'';
+
+  description = ''minimalistic parser of command line arguments'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/unix-opts/2018-04-30/unix-opts-20180430-git.tgz'';
+    sha256 = ''05glzp47kn022jkbbvhnygaibrqnpr44q19lwhm20h4nkpkj3968'';
+  };
+
+  packageName = "unix-opts";
+
+  asdFilesToKeep = ["unix-opts.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM unix-opts DESCRIPTION minimalistic parser of command line arguments
+    SHA256 05glzp47kn022jkbbvhnygaibrqnpr44q19lwhm20h4nkpkj3968 URL
+    http://beta.quicklisp.org/archive/unix-opts/2018-04-30/unix-opts-20180430-git.tgz
+    MD5 2875ea0a1f5c49ef2697bb1046c4c4e5 NAME unix-opts FILENAME unix-opts DEPS
+    NIL DEPENDENCIES NIL VERSION 20180430-git SIBLINGS (unix-opts-tests)
+    PARASITES NIL) */
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
index ea08214cb6f5..a9a1cfc7ec02 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
@@ -5,7 +5,7 @@ args @ { fetchurl, ... }:
 
   parasites = [ "xmls/octets" "xmls/test" "xmls/unit-test" ];
 
-  description = '''';
+  description = ''System lacks description'';
 
   deps = [ args."cl-ppcre" args."fiveam" args."flexi-streams" ];
 
@@ -19,7 +19,7 @@ args @ { fetchurl, ... }:
   asdFilesToKeep = ["xmls.asd"];
   overrides = x: x;
 }
-/* (SYSTEM xmls DESCRIPTION NIL SHA256
+/* (SYSTEM xmls DESCRIPTION System lacks description SHA256
     1r7mvw62zjcg45j3hm8jlbiisad2b415pghn6qcmhl03dmgp7kgi URL
     http://beta.quicklisp.org/archive/xmls/2018-04-30/xmls-3.0.2.tgz MD5
     2462bab4a5d74e87ef7bdef41cd06dc8 NAME xmls FILENAME xmls DEPS
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index 052bfb119498..1ff76e3ec4cf 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -43,11 +43,24 @@ in
     propagatedBuildInputs = (x.propagatedBuildInputs or [])
      ++ (with pkgs; [libfixposix gcc])
      ;
+    overrides = y: (x.overrides y) // {
+      prePatch = ''
+        sed 's|default \"libfixposix\"|default \"${pkgs.libfixposix}/lib/libfixposix\"|' -i src/syscalls/ffi-functions-unix.lisp
+      '';
+    };
+
   };
   cxml = skipBuildPhase;
   wookie = addNativeLibs (with pkgs; [libuv openssl]);
   lev = addNativeLibs [pkgs.libev];
-  cl_plus_ssl = addNativeLibs [pkgs.openssl];
+  cl_plus_ssl = x: rec {
+    propagatedBuildInputs = [pkgs.openssl];
+    overrides = y: (x.overrides y) // {
+      prePatch = ''
+        sed 's|libssl.so|${pkgs.openssl.out}/lib/libssl.so|' -i src/reload.lisp
+      '';
+    };
+  };
   cl-colors = skipBuildPhase;
   cl-libuv = addNativeLibs [pkgs.libuv];
   cl-async-ssl = addNativeLibs [pkgs.openssl (import ./openssl-lib-marked.nix)];
@@ -85,7 +98,14 @@ $out/lib/common-lisp/query-fs"
       '';
     };
   };
-  sqlite = addNativeLibs [pkgs.sqlite];
+  sqlite = x: {
+    propagatedBuildInputs = [pkgs.sqlite];
+    overrides = y: (x.overrides y) // {
+      prePatch = ((x.overrides y).preConfigure or "") + ''
+        sed 's|libsqlite3|${pkgs.sqlite.out}/lib/libsqlite3|' -i sqlite-ffi.lisp
+      '';
+    };
+  };
   swank = x: {
     overrides = y: (x.overrides y) // {
       postPatch = ''
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
index 5c56ddfa2a2f..a4dee0bce573 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
@@ -10,8 +10,7 @@ cffi
 cffi-grovel
 chipz
 circular-streams
-clack
-clack-v1-compat
+cl+ssl
 cl-ansi-text
 cl-async
 cl-async-base
@@ -21,6 +20,7 @@ cl-base64
 cl-cli
 cl-colors
 cl-cookie
+cl-css
 cl-csv
 cl-dbi
 cl-emb
@@ -33,8 +33,6 @@ cl-json
 cl-l10n
 cl-libuv
 cl-mysql
-closer-mop
-closure-html
 cl-pdf
 cl-ppcre
 cl-ppcre-template
@@ -42,12 +40,6 @@ cl-ppcre-unicode
 cl-protobufs
 cl-reexport
 cl-smtp
-clsql
-clsql-postgresql
-clsql-postgresql-socket
-clsql-sqlite3
-clss
-cl+ssl
 cl-syntax-annot
 cl-syntax-anonfun
 cl-syntax-markup
@@ -58,9 +50,17 @@ cl-unification
 cl-utilities
 cl-vectors
 cl-who
+clack
+clack-v1-compat
+closer-mop
+closure-html
+clsql
+clsql-postgresql
+clsql-postgresql-socket
+clsql-sqlite3
+clss
 clx
 clx-truetype
-xembed
 command-line-arguments
 css-lite
 css-selectors
@@ -70,6 +70,7 @@ cxml
 dbd-mysql
 dbd-postgres
 dbd-sqlite3
+dbus
 dexador
 documentation-utils
 drakma
@@ -93,15 +94,17 @@ iterate
 lack
 let-plus
 lev
-lisp-namespace
-local-time
 lfarm-client
 lfarm-server
 lfarm-ssl
+lisp-namespace
+local-time
+log4cl
 lparallel
 lquery
 marshal
 misc-extensions
+mk-string-metrics
 mt19937
 nibbles
 optima
@@ -111,24 +114,32 @@ plump
 proc-parse
 prove
 prove
+prove-asdf
 query-fs
 quri
 salza2
 simple-date
 smart-buffer
 split-sequence
+sqlite
 static-vectors
+str
 stumpwm
+swank
 swap-bytes
+trivia
 trivial-backtrace
+trivial-clipboard
 trivial-indent
 trivial-mimes
 trivial-types
 trivial-utf-8
 uffi
+unix-opts
 usocket
 woo
 wookie
+xembed
 xkeyboard
 xmls
 xsubseq
diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix
index 2e71e0174f62..d430f72353a1 100644
--- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix
+++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix
@@ -20,18 +20,103 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "lfarm-common" = buildLispPackage
+  "type-i" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."lfarm-common" or (x: {}))
-       (import ./quicklisp-to-nix-output/lfarm-common.nix {
+       (qlOverrides."type-i" or (x: {}))
+       (import ./quicklisp-to-nix-output/type-i.nix {
          inherit fetchurl;
            "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
-           "cl-store" = quicklisp-to-nix-packages."cl-store";
-           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
-           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
-           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
-           "usocket" = quicklisp-to-nix-packages."usocket";
+           "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+           "introspect-environment" = quicklisp-to-nix-packages."introspect-environment";
+           "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace";
+           "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0";
+           "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1";
+           "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2";
+           "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial";
+           "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2";
+       }));
+
+
+  "trivial-cltl2" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."trivial-cltl2" or (x: {}))
+       (import ./quicklisp-to-nix-output/trivial-cltl2.nix {
+         inherit fetchurl;
+       }));
+
+
+  "trivia_dot_trivial" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."trivia_dot_trivial" or (x: {}))
+       (import ./quicklisp-to-nix-output/trivia_dot_trivial.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+           "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace";
+           "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0";
+           "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1";
+           "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2";
+           "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2";
+       }));
+
+
+  "trivia_dot_level2" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."trivia_dot_level2" or (x: {}))
+       (import ./quicklisp-to-nix-output/trivia_dot_level2.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+           "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace";
+           "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0";
+           "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1";
+           "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2";
+       }));
+
+
+  "trivia_dot_level1" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."trivia_dot_level1" or (x: {}))
+       (import ./quicklisp-to-nix-output/trivia_dot_level1.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0";
+       }));
+
+
+  "trivia_dot_level0" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."trivia_dot_level0" or (x: {}))
+       (import ./quicklisp-to-nix-output/trivia_dot_level0.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+       }));
+
+
+  "trivia_dot_balland2006" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."trivia_dot_balland2006" or (x: {}))
+       (import ./quicklisp-to-nix-output/trivia_dot_balland2006.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+           "introspect-environment" = quicklisp-to-nix-packages."introspect-environment";
+           "iterate" = quicklisp-to-nix-packages."iterate";
+           "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace";
+           "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0";
+           "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1";
+           "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2";
+           "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial";
+           "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2";
+           "type-i" = quicklisp-to-nix-packages."type-i";
+       }));
+
+
+  "introspect-environment" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."introspect-environment" or (x: {}))
+       (import ./quicklisp-to-nix-output/introspect-environment.nix {
+         inherit fetchurl;
        }));
 
 
@@ -47,6 +132,21 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "lfarm-common" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."lfarm-common" or (x: {}))
+       (import ./quicklisp-to-nix-output/lfarm-common.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "cl-store" = quicklisp-to-nix-packages."cl-store";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "usocket" = quicklisp-to-nix-packages."usocket";
+       }));
+
+
   "rt" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."rt" or (x: {}))
@@ -124,16 +224,27 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "sqlite" = buildLispPackage
+  "cl-xmlspam" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."sqlite" or (x: {}))
-       (import ./quicklisp-to-nix-output/sqlite.nix {
+       (qlOverrides."cl-xmlspam" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-xmlspam.nix {
          inherit fetchurl;
            "alexandria" = quicklisp-to-nix-packages."alexandria";
            "babel" = quicklisp-to-nix-packages."babel";
-           "cffi" = quicklisp-to-nix-packages."cffi";
-           "iterate" = quicklisp-to-nix-packages."iterate";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "closure-common" = quicklisp-to-nix-packages."closure-common";
+           "cxml" = quicklisp-to-nix-packages."cxml";
+           "puri" = quicklisp-to-nix-packages."puri";
            "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+       }));
+
+
+  "asdf-package-system" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."asdf-package-system" or (x: {}))
+       (import ./quicklisp-to-nix-output/asdf-package-system.nix {
+         inherit fetchurl;
        }));
 
 
@@ -207,14 +318,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "swank" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."swank" or (x: {}))
-       (import ./quicklisp-to-nix-output/swank.nix {
-         inherit fetchurl;
-       }));
-
-
   "collectors" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."collectors" or (x: {}))
@@ -314,6 +417,16 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "clsql-uffi" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."clsql-uffi" or (x: {}))
+       (import ./quicklisp-to-nix-output/clsql-uffi.nix {
+         inherit fetchurl;
+           "clsql" = quicklisp-to-nix-packages."clsql";
+           "uffi" = quicklisp-to-nix-packages."uffi";
+       }));
+
+
   "cl-paths" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-paths" or (x: {}))
@@ -346,16 +459,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "clsql-uffi" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."clsql-uffi" or (x: {}))
-       (import ./quicklisp-to-nix-output/clsql-uffi.nix {
-         inherit fetchurl;
-           "clsql" = quicklisp-to-nix-packages."clsql";
-           "uffi" = quicklisp-to-nix-packages."uffi";
-       }));
-
-
   "cl-ppcre-test" = quicklisp-to-nix-packages."cl-ppcre";
 
 
@@ -884,6 +987,15 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "xembed" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."xembed" or (x: {}))
+       (import ./quicklisp-to-nix-output/xembed.nix {
+         inherit fetchurl;
+           "clx" = quicklisp-to-nix-packages."clx";
+       }));
+
+
   "wookie" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."wookie" or (x: {}))
@@ -961,6 +1073,14 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "unix-opts" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."unix-opts" or (x: {}))
+       (import ./quicklisp-to-nix-output/unix-opts.nix {
+         inherit fetchurl;
+       }));
+
+
   "uffi" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."uffi" or (x: {}))
@@ -1001,6 +1121,15 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "trivial-clipboard" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."trivial-clipboard" or (x: {}))
+       (import ./quicklisp-to-nix-output/trivial-clipboard.nix {
+         inherit fetchurl;
+           "uiop" = quicklisp-to-nix-packages."uiop";
+       }));
+
+
   "trivial-backtrace" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."trivial-backtrace" or (x: {}))
@@ -1009,6 +1138,26 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "trivia" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."trivia" or (x: {}))
+       (import ./quicklisp-to-nix-output/trivia.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+           "introspect-environment" = quicklisp-to-nix-packages."introspect-environment";
+           "iterate" = quicklisp-to-nix-packages."iterate";
+           "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace";
+           "trivia_dot_balland2006" = quicklisp-to-nix-packages."trivia_dot_balland2006";
+           "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0";
+           "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1";
+           "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2";
+           "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial";
+           "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2";
+           "type-i" = quicklisp-to-nix-packages."type-i";
+       }));
+
+
   "swap-bytes" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."swap-bytes" or (x: {}))
@@ -1019,6 +1168,14 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "swank" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."swank" or (x: {}))
+       (import ./quicklisp-to-nix-output/swank.nix {
+         inherit fetchurl;
+       }));
+
+
   "stumpwm" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."stumpwm" or (x: {}))
@@ -1030,6 +1187,15 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "str" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."str" or (x: {}))
+       (import ./quicklisp-to-nix-output/str.nix {
+         inherit fetchurl;
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+       }));
+
+
   "static-vectors" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."static-vectors" or (x: {}))
@@ -1045,6 +1211,19 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "sqlite" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."sqlite" or (x: {}))
+       (import ./quicklisp-to-nix-output/sqlite.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "iterate" = quicklisp-to-nix-packages."iterate";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+       }));
+
+
   "split-sequence" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."split-sequence" or (x: {}))
@@ -1124,6 +1303,14 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "prove-asdf" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."prove-asdf" or (x: {}))
+       (import ./quicklisp-to-nix-output/prove-asdf.nix {
+         inherit fetchurl;
+       }));
+
+
   "prove" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."prove" or (x: {}))
@@ -1211,6 +1398,14 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "mk-string-metrics" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."mk-string-metrics" or (x: {}))
+       (import ./quicklisp-to-nix-output/mk-string-metrics.nix {
+         inherit fetchurl;
+       }));
+
+
   "misc-extensions" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."misc-extensions" or (x: {}))
@@ -1251,6 +1446,38 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "log4cl" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."log4cl" or (x: {}))
+       (import ./quicklisp-to-nix-output/log4cl.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "stefil" = quicklisp-to-nix-packages."stefil";
+       }));
+
+
+  "local-time" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."local-time" or (x: {}))
+       (import ./quicklisp-to-nix-output/local-time.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "cl-fad" = quicklisp-to-nix-packages."cl-fad";
+           "stefil" = quicklisp-to-nix-packages."stefil";
+       }));
+
+
+  "lisp-namespace" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."lisp-namespace" or (x: {}))
+       (import ./quicklisp-to-nix-output/lisp-namespace.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+       }));
+
+
   "lfarm-ssl" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."lfarm-ssl" or (x: {}))
@@ -1305,27 +1532,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "local-time" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."local-time" or (x: {}))
-       (import ./quicklisp-to-nix-output/local-time.nix {
-         inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
-           "cl-fad" = quicklisp-to-nix-packages."cl-fad";
-           "stefil" = quicklisp-to-nix-packages."stefil";
-       }));
-
-
-  "lisp-namespace" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."lisp-namespace" or (x: {}))
-       (import ./quicklisp-to-nix-output/lisp-namespace.nix {
-         inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-       }));
-
-
   "lev" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."lev" or (x: {}))
@@ -1670,6 +1876,23 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "dbus" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."dbus" or (x: {}))
+       (import ./quicklisp-to-nix-output/dbus.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "asdf-package-system" = quicklisp-to-nix-packages."asdf-package-system";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "cl-xmlspam" = quicklisp-to-nix-packages."cl-xmlspam";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "ieee-floats" = quicklisp-to-nix-packages."ieee-floats";
+           "iolib" = quicklisp-to-nix-packages."iolib";
+           "ironclad" = quicklisp-to-nix-packages."ironclad";
+           "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
+       }));
+
+
   "dbd-sqlite3" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."dbd-sqlite3" or (x: {}))
@@ -1865,15 +2088,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "xembed" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."xembed" or (x: {}))
-       (import ./quicklisp-to-nix-output/xembed.nix {
-         inherit fetchurl;
-           "clx" = quicklisp-to-nix-packages."clx";
-       }));
-
-
   "clx-truetype" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."clx-truetype" or (x: {}))
@@ -1902,6 +2116,167 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "clss" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."clss" or (x: {}))
+       (import ./quicklisp-to-nix-output/clss.nix {
+         inherit fetchurl;
+           "array-utils" = quicklisp-to-nix-packages."array-utils";
+           "documentation-utils" = quicklisp-to-nix-packages."documentation-utils";
+           "plump" = quicklisp-to-nix-packages."plump";
+           "trivial-indent" = quicklisp-to-nix-packages."trivial-indent";
+       }));
+
+
+  "clsql-sqlite3" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."clsql-sqlite3" or (x: {}))
+       (import ./quicklisp-to-nix-output/clsql-sqlite3.nix {
+         inherit fetchurl;
+           "clsql" = quicklisp-to-nix-packages."clsql";
+           "clsql-uffi" = quicklisp-to-nix-packages."clsql-uffi";
+           "uffi" = quicklisp-to-nix-packages."uffi";
+       }));
+
+
+  "clsql-postgresql-socket" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."clsql-postgresql-socket" or (x: {}))
+       (import ./quicklisp-to-nix-output/clsql-postgresql-socket.nix {
+         inherit fetchurl;
+           "clsql" = quicklisp-to-nix-packages."clsql";
+           "md5" = quicklisp-to-nix-packages."md5";
+           "uffi" = quicklisp-to-nix-packages."uffi";
+       }));
+
+
+  "clsql-postgresql" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."clsql-postgresql" or (x: {}))
+       (import ./quicklisp-to-nix-output/clsql-postgresql.nix {
+         inherit fetchurl;
+           "clsql" = quicklisp-to-nix-packages."clsql";
+           "clsql-uffi" = quicklisp-to-nix-packages."clsql-uffi";
+           "uffi" = quicklisp-to-nix-packages."uffi";
+       }));
+
+
+  "clsql" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."clsql" or (x: {}))
+       (import ./quicklisp-to-nix-output/clsql.nix {
+         inherit fetchurl;
+           "uffi" = quicklisp-to-nix-packages."uffi";
+       }));
+
+
+  "closure-html" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."closure-html" or (x: {}))
+       (import ./quicklisp-to-nix-output/closure-html.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "closure-common" = quicklisp-to-nix-packages."closure-common";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+       }));
+
+
+  "closer-mop" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."closer-mop" or (x: {}))
+       (import ./quicklisp-to-nix-output/closer-mop.nix {
+         inherit fetchurl;
+       }));
+
+
+  "clack-v1-compat" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."clack-v1-compat" or (x: {}))
+       (import ./quicklisp-to-nix-output/clack-v1-compat.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "anaphora" = quicklisp-to-nix-packages."anaphora";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
+           "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain";
+           "chipz" = quicklisp-to-nix-packages."chipz";
+           "chunga" = quicklisp-to-nix-packages."chunga";
+           "circular-streams" = quicklisp-to-nix-packages."circular-streams";
+           "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl";
+           "cl-annot" = quicklisp-to-nix-packages."cl-annot";
+           "cl-ansi-text" = quicklisp-to-nix-packages."cl-ansi-text";
+           "cl-base64" = quicklisp-to-nix-packages."cl-base64";
+           "cl-colors" = quicklisp-to-nix-packages."cl-colors";
+           "cl-cookie" = quicklisp-to-nix-packages."cl-cookie";
+           "cl-fad" = quicklisp-to-nix-packages."cl-fad";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "cl-reexport" = quicklisp-to-nix-packages."cl-reexport";
+           "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
+           "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
+           "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
+           "clack" = quicklisp-to-nix-packages."clack";
+           "clack-handler-hunchentoot" = quicklisp-to-nix-packages."clack-handler-hunchentoot";
+           "clack-socket" = quicklisp-to-nix-packages."clack-socket";
+           "clack-test" = quicklisp-to-nix-packages."clack-test";
+           "dexador" = quicklisp-to-nix-packages."dexador";
+           "fast-http" = quicklisp-to-nix-packages."fast-http";
+           "fast-io" = quicklisp-to-nix-packages."fast-io";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "http-body" = quicklisp-to-nix-packages."http-body";
+           "hunchentoot" = quicklisp-to-nix-packages."hunchentoot";
+           "ironclad" = quicklisp-to-nix-packages."ironclad";
+           "jonathan" = quicklisp-to-nix-packages."jonathan";
+           "lack" = quicklisp-to-nix-packages."lack";
+           "lack-component" = quicklisp-to-nix-packages."lack-component";
+           "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace";
+           "lack-util" = quicklisp-to-nix-packages."lack-util";
+           "let-plus" = quicklisp-to-nix-packages."let-plus";
+           "local-time" = quicklisp-to-nix-packages."local-time";
+           "marshal" = quicklisp-to-nix-packages."marshal";
+           "md5" = quicklisp-to-nix-packages."md5";
+           "named-readtables" = quicklisp-to-nix-packages."named-readtables";
+           "nibbles" = quicklisp-to-nix-packages."nibbles";
+           "proc-parse" = quicklisp-to-nix-packages."proc-parse";
+           "prove" = quicklisp-to-nix-packages."prove";
+           "quri" = quicklisp-to-nix-packages."quri";
+           "rfc2388" = quicklisp-to-nix-packages."rfc2388";
+           "smart-buffer" = quicklisp-to-nix-packages."smart-buffer";
+           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+           "static-vectors" = quicklisp-to-nix-packages."static-vectors";
+           "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes";
+           "trivial-types" = quicklisp-to-nix-packages."trivial-types";
+           "uiop" = quicklisp-to-nix-packages."uiop";
+           "usocket" = quicklisp-to-nix-packages."usocket";
+           "xsubseq" = quicklisp-to-nix-packages."xsubseq";
+       }));
+
+
+  "clack" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."clack" or (x: {}))
+       (import ./quicklisp-to-nix-output/clack.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "ironclad" = quicklisp-to-nix-packages."ironclad";
+           "lack" = quicklisp-to-nix-packages."lack";
+           "lack-component" = quicklisp-to-nix-packages."lack-component";
+           "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace";
+           "lack-util" = quicklisp-to-nix-packages."lack-util";
+           "nibbles" = quicklisp-to-nix-packages."nibbles";
+           "uiop" = quicklisp-to-nix-packages."uiop";
+       }));
+
+
   "cl-who" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-who" or (x: {}))
@@ -2010,77 +2385,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "cl_plus_ssl" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."cl_plus_ssl" or (x: {}))
-       (import ./quicklisp-to-nix-output/cl_plus_ssl.nix {
-         inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "babel" = quicklisp-to-nix-packages."babel";
-           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
-           "cffi" = quicklisp-to-nix-packages."cffi";
-           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
-           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
-           "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
-           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
-           "uiop" = quicklisp-to-nix-packages."uiop";
-       }));
-
-
-  "clss" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."clss" or (x: {}))
-       (import ./quicklisp-to-nix-output/clss.nix {
-         inherit fetchurl;
-           "array-utils" = quicklisp-to-nix-packages."array-utils";
-           "documentation-utils" = quicklisp-to-nix-packages."documentation-utils";
-           "plump" = quicklisp-to-nix-packages."plump";
-           "trivial-indent" = quicklisp-to-nix-packages."trivial-indent";
-       }));
-
-
-  "clsql-sqlite3" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."clsql-sqlite3" or (x: {}))
-       (import ./quicklisp-to-nix-output/clsql-sqlite3.nix {
-         inherit fetchurl;
-           "clsql" = quicklisp-to-nix-packages."clsql";
-           "clsql-uffi" = quicklisp-to-nix-packages."clsql-uffi";
-           "uffi" = quicklisp-to-nix-packages."uffi";
-       }));
-
-
-  "clsql-postgresql-socket" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."clsql-postgresql-socket" or (x: {}))
-       (import ./quicklisp-to-nix-output/clsql-postgresql-socket.nix {
-         inherit fetchurl;
-           "clsql" = quicklisp-to-nix-packages."clsql";
-           "md5" = quicklisp-to-nix-packages."md5";
-           "uffi" = quicklisp-to-nix-packages."uffi";
-       }));
-
-
-  "clsql-postgresql" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."clsql-postgresql" or (x: {}))
-       (import ./quicklisp-to-nix-output/clsql-postgresql.nix {
-         inherit fetchurl;
-           "clsql" = quicklisp-to-nix-packages."clsql";
-           "clsql-uffi" = quicklisp-to-nix-packages."clsql-uffi";
-           "uffi" = quicklisp-to-nix-packages."uffi";
-       }));
-
-
-  "clsql" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."clsql" or (x: {}))
-       (import ./quicklisp-to-nix-output/clsql.nix {
-         inherit fetchurl;
-           "uffi" = quicklisp-to-nix-packages."uffi";
-       }));
-
-
   "cl-smtp" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-smtp" or (x: {}))
@@ -2165,28 +2469,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "closure-html" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."closure-html" or (x: {}))
-       (import ./quicklisp-to-nix-output/closure-html.nix {
-         inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "babel" = quicklisp-to-nix-packages."babel";
-           "closure-common" = quicklisp-to-nix-packages."closure-common";
-           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
-           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
-           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
-       }));
-
-
-  "closer-mop" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."closer-mop" or (x: {}))
-       (import ./quicklisp-to-nix-output/closer-mop.nix {
-         inherit fetchurl;
-       }));
-
-
   "cl-mysql" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-mysql" or (x: {}))
@@ -2360,6 +2642,14 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "cl-css" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-css" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-css.nix {
+         inherit fetchurl;
+       }));
+
+
   "cl-cookie" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-cookie" or (x: {}))
@@ -2495,87 +2785,19 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "clack-v1-compat" = buildLispPackage
+  "cl_plus_ssl" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."clack-v1-compat" or (x: {}))
-       (import ./quicklisp-to-nix-output/clack-v1-compat.nix {
+       (qlOverrides."cl_plus_ssl" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl_plus_ssl.nix {
          inherit fetchurl;
            "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "anaphora" = quicklisp-to-nix-packages."anaphora";
            "babel" = quicklisp-to-nix-packages."babel";
            "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
            "cffi" = quicklisp-to-nix-packages."cffi";
-           "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
-           "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain";
-           "chipz" = quicklisp-to-nix-packages."chipz";
-           "chunga" = quicklisp-to-nix-packages."chunga";
-           "circular-streams" = quicklisp-to-nix-packages."circular-streams";
-           "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl";
-           "cl-annot" = quicklisp-to-nix-packages."cl-annot";
-           "cl-ansi-text" = quicklisp-to-nix-packages."cl-ansi-text";
-           "cl-base64" = quicklisp-to-nix-packages."cl-base64";
-           "cl-colors" = quicklisp-to-nix-packages."cl-colors";
-           "cl-cookie" = quicklisp-to-nix-packages."cl-cookie";
-           "cl-fad" = quicklisp-to-nix-packages."cl-fad";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "cl-reexport" = quicklisp-to-nix-packages."cl-reexport";
-           "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
-           "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
-           "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
-           "clack" = quicklisp-to-nix-packages."clack";
-           "clack-handler-hunchentoot" = quicklisp-to-nix-packages."clack-handler-hunchentoot";
-           "clack-socket" = quicklisp-to-nix-packages."clack-socket";
-           "clack-test" = quicklisp-to-nix-packages."clack-test";
-           "dexador" = quicklisp-to-nix-packages."dexador";
-           "fast-http" = quicklisp-to-nix-packages."fast-http";
-           "fast-io" = quicklisp-to-nix-packages."fast-io";
            "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
-           "http-body" = quicklisp-to-nix-packages."http-body";
-           "hunchentoot" = quicklisp-to-nix-packages."hunchentoot";
-           "ironclad" = quicklisp-to-nix-packages."ironclad";
-           "jonathan" = quicklisp-to-nix-packages."jonathan";
-           "lack" = quicklisp-to-nix-packages."lack";
-           "lack-component" = quicklisp-to-nix-packages."lack-component";
-           "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace";
-           "lack-util" = quicklisp-to-nix-packages."lack-util";
-           "let-plus" = quicklisp-to-nix-packages."let-plus";
-           "local-time" = quicklisp-to-nix-packages."local-time";
-           "marshal" = quicklisp-to-nix-packages."marshal";
-           "md5" = quicklisp-to-nix-packages."md5";
-           "named-readtables" = quicklisp-to-nix-packages."named-readtables";
-           "nibbles" = quicklisp-to-nix-packages."nibbles";
-           "proc-parse" = quicklisp-to-nix-packages."proc-parse";
-           "prove" = quicklisp-to-nix-packages."prove";
-           "quri" = quicklisp-to-nix-packages."quri";
-           "rfc2388" = quicklisp-to-nix-packages."rfc2388";
-           "smart-buffer" = quicklisp-to-nix-packages."smart-buffer";
-           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
-           "static-vectors" = quicklisp-to-nix-packages."static-vectors";
-           "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
            "trivial-features" = quicklisp-to-nix-packages."trivial-features";
            "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
            "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
-           "trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes";
-           "trivial-types" = quicklisp-to-nix-packages."trivial-types";
-           "uiop" = quicklisp-to-nix-packages."uiop";
-           "usocket" = quicklisp-to-nix-packages."usocket";
-           "xsubseq" = quicklisp-to-nix-packages."xsubseq";
-       }));
-
-
-  "clack" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."clack" or (x: {}))
-       (import ./quicklisp-to-nix-output/clack.nix {
-         inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
-           "ironclad" = quicklisp-to-nix-packages."ironclad";
-           "lack" = quicklisp-to-nix-packages."lack";
-           "lack-component" = quicklisp-to-nix-packages."lack-component";
-           "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace";
-           "lack-util" = quicklisp-to-nix-packages."lack-util";
-           "nibbles" = quicklisp-to-nix-packages."nibbles";
            "uiop" = quicklisp-to-nix-packages."uiop";
        }));
 
diff --git a/nixpkgs/pkgs/development/lua-modules/overrides.nix b/nixpkgs/pkgs/development/lua-modules/overrides.nix
index 233503c2eca8..9f57fbb5fa9e 100644
--- a/nixpkgs/pkgs/development/lua-modules/overrides.nix
+++ b/nixpkgs/pkgs/development/lua-modules/overrides.nix
@@ -276,8 +276,19 @@ with super;
     propagatedBuildInputs = [
       pkgs.libuv
     ];
+
+    passthru = {
+      libluv = self.luv.override({
+        preBuild = self.luv.preBuild + ''
+         sed -i 's,\(option(BUILD_MODULE.*\)ON,\1OFF,' CMakeLists.txt
+         sed -i 's,\(option(BUILD_SHARED_LIBS.*\)OFF,\1ON,' CMakeLists.txt
+         sed -i 's,${"\${INSTALL_INC_DIR}"},${placeholder "out"}/include/luv,' CMakeLists.txt
+        '';
+      });
+    };
   });
 
+
   rapidjson = super.rapidjson.override({
     preBuild = ''
       sed -i '/set(CMAKE_CXX_FLAGS/d' CMakeLists.txt
diff --git a/nixpkgs/pkgs/development/node-packages/node-packages-v10.json b/nixpkgs/pkgs/development/node-packages/node-packages-v10.json
index ef5afe371174..defeb3e1682e 100644
--- a/nixpkgs/pkgs/development/node-packages/node-packages-v10.json
+++ b/nixpkgs/pkgs/development/node-packages/node-packages-v10.json
@@ -30,6 +30,7 @@
 , "dat"
 , "dhcp"
 , "dnschain"
+, "dockerfile-language-server-nodejs"
 , "elasticdump"
 , "elm-live"
 , "elm-oracle"
@@ -56,6 +57,7 @@
 , "indium"
 , "ionic"
 , "ios-deploy"
+, { "iosevka-build-deps": "../../data/fonts/iosevka" }
 , "jake"
 , "javascript-typescript-langserver"
 , "joplin"
diff --git a/nixpkgs/pkgs/development/node-packages/node-packages-v10.nix b/nixpkgs/pkgs/development/node-packages/node-packages-v10.nix
index 3f4c4d1b9b54..636ba8173178 100644
--- a/nixpkgs/pkgs/development/node-packages/node-packages-v10.nix
+++ b/nixpkgs/pkgs/development/node-packages/node-packages-v10.nix
@@ -13,31 +13,31 @@ let
         sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ==";
       };
     };
-    "@angular-devkit/architect-0.803.4" = {
+    "@angular-devkit/architect-0.803.5" = {
       name = "_at_angular-devkit_slash_architect";
       packageName = "@angular-devkit/architect";
-      version = "0.803.4";
+      version = "0.803.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.803.4.tgz";
-        sha512 = "Ek+xb9GfzHLbD+ATmupbzTSNFGddkH6dbb36cB6gme+vnlBVfXP0dxOg5lRKZoUIFJyREl9jSrA5zUhVwXaoVg==";
+        url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.803.5.tgz";
+        sha512 = "hOcYF5fG3oieTc/C1QZqXsON8m8cpdtfdWhY7F7tmqqZ4JBR7igH4SSFQOoQwTj77rsqtkOLI9isVLpoSGX0DQ==";
       };
     };
-    "@angular-devkit/core-8.3.4" = {
+    "@angular-devkit/core-8.3.5" = {
       name = "_at_angular-devkit_slash_core";
       packageName = "@angular-devkit/core";
-      version = "8.3.4";
+      version = "8.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/core/-/core-8.3.4.tgz";
-        sha512 = "QjUN9EakpQ+sFYeMfBMecxVhgI4Vdg0k20h6PZDjZ9lqYNXjpaQVtBo7qiPYHh5kQeJEvdrzca6yeYuCP3TvZw==";
+        url = "https://registry.npmjs.org/@angular-devkit/core/-/core-8.3.5.tgz";
+        sha512 = "ag7Nr94wQUqCFtZjw+rMET+djGBmLk989Id5lLWViW99g4XFeS+e45mJv3JYRzF218+6EdicZz0DGQRYHekVeg==";
       };
     };
-    "@angular-devkit/schematics-8.3.4" = {
+    "@angular-devkit/schematics-8.3.5" = {
       name = "_at_angular-devkit_slash_schematics";
       packageName = "@angular-devkit/schematics";
-      version = "8.3.4";
+      version = "8.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.3.4.tgz";
-        sha512 = "+QXhrAEcReQJL4fn+35NbcdW5d1vawqSZUokqga8E971YUVUk55mHpIQ39Vpj3S9jhTRYwxsHl+7v9N7UaREmg==";
+        url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.3.5.tgz";
+        sha512 = "RMtM10kS+Docg90jzFMa4HQ+UzX95Gi5rCT/kSydEkBhp+Jeu/B0K2y67Fm2/qTdVNRCujrCpEmtiRcp1qsOQg==";
       };
     };
     "@antora/asciidoc-loader-2.1.1" = {
@@ -1273,13 +1273,13 @@ let
         sha1 = "890ae7c5d8c877f6d384860215ace9d7ec945bda";
       };
     };
-    "@hapi/address-2.1.1" = {
+    "@hapi/address-2.1.2" = {
       name = "_at_hapi_slash_address";
       packageName = "@hapi/address";
-      version = "2.1.1";
+      version = "2.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@hapi/address/-/address-2.1.1.tgz";
-        sha512 = "DYuHzu978pP1XW1GD3HGvLnAFjbQTIgc2+V153FGkbS2pgo9haigCdwBnUDrbhaOkgiJlbZvoEqDrcxSLHpiWA==";
+        url = "https://registry.npmjs.org/@hapi/address/-/address-2.1.2.tgz";
+        sha512 = "O4QDrx+JoGKZc6aN64L04vqa7e41tIiLU+OvKdcYaEMP97UttL0f9GIi9/0A4WAMx0uBd6SidDIhktZhgOcN8Q==";
       };
     };
     "@hapi/bourne-1.3.2" = {
@@ -1309,13 +1309,13 @@ let
         sha512 = "entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ==";
       };
     };
-    "@hapi/topo-3.1.3" = {
+    "@hapi/topo-3.1.4" = {
       name = "_at_hapi_slash_topo";
       packageName = "@hapi/topo";
-      version = "3.1.3";
+      version = "3.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.3.tgz";
-        sha512 = "JmS9/vQK6dcUYn7wc2YZTqzIKubAQcJKu2KCKAru6es482U5RT5fP1EXCPtlXpiK7PR0On/kpQKI4fRKkzpZBQ==";
+        url = "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.4.tgz";
+        sha512 = "aVWQTOI9wBD6zawmOr6f+tdEIxQC8JXfQVLTjgGe8YEStAWGn/GNNVTobKJhbWKveQj2RyYF3oYbO9SC8/eOCA==";
       };
     };
     "@iarna/toml-2.2.3" = {
@@ -1327,94 +1327,94 @@ let
         sha512 = "FmuxfCuolpLl0AnQ2NHSzoUKWEJDFl63qXjzdoWBVyFCXzMGm1spBzk7LeHNoVCiWCF7mRVms9e6jEV9+MoPbg==";
       };
     };
-    "@ionic/cli-framework-2.1.6" = {
+    "@ionic/cli-framework-2.1.7" = {
       name = "_at_ionic_slash_cli-framework";
       packageName = "@ionic/cli-framework";
-      version = "2.1.6";
+      version = "2.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-2.1.6.tgz";
-        sha512 = "V0jkrOXfPes0N1ECmiWDgcRZSaWq7PUFCctMNNqe4xwbQ61aDNypEIQCvVdgIk16zVBKrMI4EP94Qplvi6CYGw==";
+        url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-2.1.7.tgz";
+        sha512 = "osuKbmCIzT0H+g39lDy+EmsP5RHc+aYOv+BN+IngsaxKb7ya0V/JlLO1vLkd7RYT+lmiQWiCi7RpHPeEgQJFtw==";
       };
     };
-    "@ionic/discover-2.0.5" = {
+    "@ionic/discover-2.0.6" = {
       name = "_at_ionic_slash_discover";
       packageName = "@ionic/discover";
-      version = "2.0.5";
+      version = "2.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/discover/-/discover-2.0.5.tgz";
-        sha512 = "4gVq4UvCHzgQtE0Sffc6MZiwDE9XjWhYsKm81h85dz/iVT4sx0c5fFvJzGXg7OFHCsVN2PhmlIwdgmYetqB5Ow==";
+        url = "https://registry.npmjs.org/@ionic/discover/-/discover-2.0.6.tgz";
+        sha512 = "OEjUcVDliTqCWlFGFbD+msTLwQCXNHXUTdg6PQIjDn5RipVSWtpVB+DjLO+D1zYkY6TgD9mxBcIwiYJBRuw5dg==";
       };
     };
-    "@ionic/utils-array-1.2.0" = {
+    "@ionic/utils-array-1.2.1" = {
       name = "_at_ionic_slash_utils-array";
       packageName = "@ionic/utils-array";
-      version = "1.2.0";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/utils-array/-/utils-array-1.2.0.tgz";
-        sha512 = "wJfshi287FRjZM43+w3OkMl4n7hDTmK/9Jxm9Ot5hBDgeLP6Fw/OBb6tt+nGjhRBJbk1oOi7ksJgyBw/+1ldzg==";
+        url = "https://registry.npmjs.org/@ionic/utils-array/-/utils-array-1.2.1.tgz";
+        sha512 = "t0/gXFf70oDPpviGUHpaDD9++zIx8nFXpPm8c3We8iH5dRwEJLSun+AJTqxO/XPzEhM24KBuj3rLY9bSYBadEg==";
       };
     };
-    "@ionic/utils-fs-2.0.6" = {
+    "@ionic/utils-fs-2.0.7" = {
       name = "_at_ionic_slash_utils-fs";
       packageName = "@ionic/utils-fs";
-      version = "2.0.6";
+      version = "2.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-2.0.6.tgz";
-        sha512 = "iU1UwU5NW2nlLvNNE3QoeH6I+wN3a4ypHFcS6Bp7qUDENeI+oTxHzVHKHM6qt7T/24TFLNcHVxcq/pGIt7vgOA==";
+        url = "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-2.0.7.tgz";
+        sha512 = "rXTKJD66qocDs8w72+z7yw6P8H095yexIMsUbNiJFjMm3Cx542i+Tw9gbGwYN356WrA/0EATXD/zVZDzvDsSKQ==";
       };
     };
-    "@ionic/utils-network-1.0.4" = {
+    "@ionic/utils-network-1.0.5" = {
       name = "_at_ionic_slash_utils-network";
       packageName = "@ionic/utils-network";
-      version = "1.0.4";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-1.0.4.tgz";
-        sha512 = "VDWlschcLc6t71AAk54ywycVwahRv2qK82DOxdiN02YwurqXclcT2wmZCjnzAgBOPEepqmxj0mKozPA9YYWcbg==";
+        url = "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-1.0.5.tgz";
+        sha512 = "seOoxQUKTugpNjQWYVAmylh6mfddPyE2EsWWyn6ojkp7HurMadvRZa9OQ/PrhMjkphHupPMyuIukaD7F2zMW9Q==";
       };
     };
-    "@ionic/utils-object-1.0.4" = {
+    "@ionic/utils-object-1.0.5" = {
       name = "_at_ionic_slash_utils-object";
       packageName = "@ionic/utils-object";
-      version = "1.0.4";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/utils-object/-/utils-object-1.0.4.tgz";
-        sha512 = "B05kWS+Uj0rGrvG1RvAzDBuggstmWM0X4OUb3p9GhZJJQsNK2/0W03VfPOkNuaDi15NF/WFwLS7/yp7kM25mTw==";
+        url = "https://registry.npmjs.org/@ionic/utils-object/-/utils-object-1.0.5.tgz";
+        sha512 = "nyNH8EJcE/xl5G7Zyz5Thy5f1Otj+fhsXca3C5WsCG6y7yb2biDaaw3lgq/KtEYfXyH1znHsbs9hdJNLgCefGQ==";
       };
     };
-    "@ionic/utils-process-1.0.4" = {
+    "@ionic/utils-process-1.0.5" = {
       name = "_at_ionic_slash_utils-process";
       packageName = "@ionic/utils-process";
-      version = "1.0.4";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/utils-process/-/utils-process-1.0.4.tgz";
-        sha512 = "F70r4Dup0yz03lDVCiRva2Qz7+VXNtUnfx7pfIFaDQv54sUem7ozG6zl4db5EE3a4RAJUCbM5YQFsAojnEUc+g==";
+        url = "https://registry.npmjs.org/@ionic/utils-process/-/utils-process-1.0.5.tgz";
+        sha512 = "zzDeLiz2lnpI9hKoMHbQiKfbnfFor9LXcW1ZWIKy9YkGOXv80UWbQq43CstMtnDtghcXLS02DaOVtcJPh47psw==";
       };
     };
-    "@ionic/utils-stream-2.0.3" = {
+    "@ionic/utils-stream-2.0.4" = {
       name = "_at_ionic_slash_utils-stream";
       packageName = "@ionic/utils-stream";
-      version = "2.0.3";
+      version = "2.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/utils-stream/-/utils-stream-2.0.3.tgz";
-        sha512 = "Y1OAcJwP8uNCYQiRxywfo85jdOVbfdvRwjuvFVupFrLQet6kOBKh9wHHnivoS9du+Wlq4VjuFh03LmmAaHwenA==";
+        url = "https://registry.npmjs.org/@ionic/utils-stream/-/utils-stream-2.0.4.tgz";
+        sha512 = "qha4Msonb44++xvf8YppBR27dNBRuMLSty4/THH9uD6UEdjU2+23LWACKuqnQUSsZjQdvALVDMcRRWEIYEL2VQ==";
       };
     };
-    "@ionic/utils-subprocess-1.0.7" = {
+    "@ionic/utils-subprocess-1.0.8" = {
       name = "_at_ionic_slash_utils-subprocess";
       packageName = "@ionic/utils-subprocess";
-      version = "1.0.7";
+      version = "1.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/utils-subprocess/-/utils-subprocess-1.0.7.tgz";
-        sha512 = "QXCqdwSSGiyxgs36faSbxiVIRCUBI6ckmCSWSLRGZAo4EZ7MuPQUqU+oVILkTWTOPAMWNcJtS67zJNMTccsSUg==";
+        url = "https://registry.npmjs.org/@ionic/utils-subprocess/-/utils-subprocess-1.0.8.tgz";
+        sha512 = "gfVCzccOQ3PVfY6d1hDZq1Qv7hOXAn3ZlepAEbUBOeFauIhXmwmwVdIRa9cfi3cESpDidNQ3dpmXyC+nKxv0Og==";
       };
     };
-    "@ionic/utils-terminal-1.0.4" = {
+    "@ionic/utils-terminal-1.0.5" = {
       name = "_at_ionic_slash_utils-terminal";
       packageName = "@ionic/utils-terminal";
-      version = "1.0.4";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/utils-terminal/-/utils-terminal-1.0.4.tgz";
-        sha512 = "+iJbFff7mnJ6ROE465+/DG8eweFmINVy69Bdw9fr8Vcf8WhJWxMw0vd59J/gaUSsHuxoufZYftVXVoWUd8RfWA==";
+        url = "https://registry.npmjs.org/@ionic/utils-terminal/-/utils-terminal-1.0.5.tgz";
+        sha512 = "kaE/sKG3p6y9n73IfR0hU218YORS9P1sg4+GYCie+iGxSTixcKIX7yUBOCY1s2Oav0xS9mjGcpa6ppzANC70bw==";
       };
     };
     "@kbrandwijk/swagger-to-graphql-2.4.3" = {
@@ -2065,13 +2065,13 @@ let
         sha512 = "L4JaJDXn8SGT+5G0uX79rZLv0MNJmfGa4vb4vy1NnpjSnWDLJRy6m90udGwvMmavwsStgbv2QNkPzzTCMmL+ig==";
       };
     };
-    "@octokit/rest-16.28.9" = {
+    "@octokit/rest-16.30.0" = {
       name = "_at_octokit_slash_rest";
       packageName = "@octokit/rest";
-      version = "16.28.9";
+      version = "16.30.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.28.9.tgz";
-        sha512 = "IKGnX+Tvzt7XHhs8f4ajqxyJvYAMNX5nWfoJm4CQj8LZToMiaJgutf5KxxpxoC3y5w7JTJpW5rnWnF4TsIvCLA==";
+        url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.30.0.tgz";
+        sha512 = "TN5MbqVuqxT/s87D6tGe3zsMvyHUQSkGFMBHuwBToPQGV3eG2a67rJW2rag2vJr7JusWyERDhQ4g/4HvFo9B1g==";
       };
     };
     "@parcel/fs-1.11.0" = {
@@ -2218,31 +2218,31 @@ let
         sha512 = "YXJqp9gdHcZKAmBY/WnwFpPtNQp2huD/ME2YMurH2YHJvxrVzYsmpKw/pb7yINArRpp8E++fwbQd3ajYXGA45Q==";
       };
     };
-    "@schematics/angular-8.3.4" = {
+    "@schematics/angular-8.3.5" = {
       name = "_at_schematics_slash_angular";
       packageName = "@schematics/angular";
-      version = "8.3.4";
+      version = "8.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@schematics/angular/-/angular-8.3.4.tgz";
-        sha512 = "/HO6vZosULsJnwZLG9JLePyaR2g4MePrk27c3H/WbFNN4ajBePe1Mj34q6HCzje30NduLV8B3SykPnG1CoNy5Q==";
+        url = "https://registry.npmjs.org/@schematics/angular/-/angular-8.3.5.tgz";
+        sha512 = "3YKurSNqUfjVrbENVlnTBNGYBWjdyjrWzJRlwWbCq+owQLhkZ/N5qVirt/SDw5T9hK2AEMOKjLkQYtpE+aOCgg==";
       };
     };
-    "@schematics/update-0.803.4" = {
+    "@schematics/update-0.803.5" = {
       name = "_at_schematics_slash_update";
       packageName = "@schematics/update";
-      version = "0.803.4";
+      version = "0.803.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@schematics/update/-/update-0.803.4.tgz";
-        sha512 = "ZLCUR7VpUkv3zjeOmcny3UAtwHbQLeBeDsoLYIVQZyepqk3kRPBGaW/xYwmNng04bVfMCtcTx9yrs7n4+Lt/Iw==";
+        url = "https://registry.npmjs.org/@schematics/update/-/update-0.803.5.tgz";
+        sha512 = "v2qU0ATb1jND8GIGQFnI1QLWoquUjJ2fJ37HoDSO3rmttZ/NvoV4sNDGhk/pPUcmeXa+prURfJCCCSeHZ/yKkw==";
       };
     };
-    "@serverless/cli-1.2.1" = {
+    "@serverless/cli-1.2.3" = {
       name = "_at_serverless_slash_cli";
       packageName = "@serverless/cli";
-      version = "1.2.1";
+      version = "1.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@serverless/cli/-/cli-1.2.1.tgz";
-        sha512 = "+Ip9UsmrH2e6Q36ZHmeEWu4ez36Srl1hgeaM6t6YPGJlNRNFw650Xt43K5EAZpWVvGJNYuNaQs9FZs4ZnakLgQ==";
+        url = "https://registry.npmjs.org/@serverless/cli/-/cli-1.2.3.tgz";
+        sha512 = "N/hsPZrE/zK8Iv98bdEG7J6ZhotWXwywjc/bKWcbhZeXENqbS7UD2qtyL/pfGuNodFVG587l8Cf+UvK8OcA6Qg==";
       };
     };
     "@serverless/component-metrics-1.0.8" = {
@@ -2263,13 +2263,13 @@ let
         sha512 = "XP5KXvEGlrNIOV/KJ0KKwzeov9MqZQ+Ck3z7JW/gtd8ryoKK+5+ah2WL77DXETeHeEwxZhJdrNatqc0FXauEiw==";
       };
     };
-    "@serverless/enterprise-plugin-2.0.0" = {
+    "@serverless/enterprise-plugin-3.0.0" = {
       name = "_at_serverless_slash_enterprise-plugin";
       packageName = "@serverless/enterprise-plugin";
-      version = "2.0.0";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-2.0.0.tgz";
-        sha512 = "jfTXC3eAFkgXbsHfDwLr6od3evwnmz0KhVs/p5HXXh37BGX8ETVFUoWsrIOf92flbGDPBEyzcHXX5cfNBlfNKA==";
+        url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.0.0.tgz";
+        sha512 = "+L+SeQV0MKQN9TBXC6Xmgcw7BVfW8Q3F/lMjB1MPsBd0RZPzYnVlWcVg4cA6tgvkpfdw8NVlh/QXFs+603zHrg==";
       };
     };
     "@serverless/event-mocks-1.1.1" = {
@@ -5845,13 +5845,13 @@ let
         sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
       };
     };
-    "aws-sdk-2.529.0" = {
+    "aws-sdk-2.533.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.529.0";
+      version = "2.533.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.529.0.tgz";
-        sha512 = "CtRxgI4ZVZ8cdFCddlIVIy06cEW5gzTJBpyouZ/ySgZ6BiYj+0e77LwoNsnQE2nUNWCbydTLn3dbz4ZZMDpuIg==";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.533.0.tgz";
+        sha512 = "OSe7C0jnBdgfzedOtK+TgBEwtJaaZovm+Q2fbqIlfhUWg3rhhkt3oLyQ9bRD30/CFaunLhLr/8HAAN+/x+DWAA==";
       };
     };
     "aws-sign2-0.6.0" = {
@@ -6943,6 +6943,15 @@ let
         sha1 = "47688cb99bb6804f0e06d3e763b1c32e57d8e6b6";
       };
     };
+    "base64id-2.0.0" = {
+      name = "base64id";
+      packageName = "base64id";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz";
+        sha512 = "lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==";
+      };
+    };
     "base64url-3.0.1" = {
       name = "base64url";
       packageName = "base64url";
@@ -7105,6 +7114,15 @@ let
         sha1 = "38f716b24c8cee07a262abc41c22c314e20e3869";
       };
     };
+    "bezier-js-2.4.3" = {
+      name = "bezier-js";
+      packageName = "bezier-js";
+      version = "2.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bezier-js/-/bezier-js-2.4.3.tgz";
+        sha512 = "qAz1iAGoSE+kk5guAMyvoUgfHq+e5JwK5jRHh2/tuk4XDRUuECrrHLouN27jAzjhlJD2vAsBHofCi5sOn1jcbQ==";
+      };
+    };
     "biased-opener-0.2.8" = {
       name = "biased-opener";
       packageName = "biased-opener";
@@ -7114,13 +7132,13 @@ let
         sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4";
       };
     };
-    "big-integer-1.6.44" = {
+    "big-integer-1.6.45" = {
       name = "big-integer";
       packageName = "big-integer";
-      version = "1.6.44";
+      version = "1.6.45";
       src = fetchurl {
-        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.44.tgz";
-        sha512 = "7MzElZPTyJ2fNvBkPxtFQ2fWIkVmuzw41+BZHSzpEq3ymB2MfeKp1+yXl/tS75xCx+WnyV+yb0kp+K1C3UNwmQ==";
+        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.45.tgz";
+        sha512 = "nmb9E7oEtVJ7SmSCH/DeJobXyuRmaofkpoQSimMFu3HKJ5MADtM825SPLhDuWhZ6TElLAQtgJbQmBZuHIRlZoA==";
       };
     };
     "big.js-5.2.2" = {
@@ -7384,13 +7402,13 @@ let
         sha1 = "f962d687ec2c369570ae71af843256e6d0ca1129";
       };
     };
-    "blessed-contrib-4.8.16" = {
+    "blessed-contrib-4.8.17" = {
       name = "blessed-contrib";
       packageName = "blessed-contrib";
-      version = "4.8.16";
+      version = "4.8.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.8.16.tgz";
-        sha512 = "B1fEJTR+8IsimEvYQbvXCvnV0L674rFxy9yMwqibiRO2nxa5fzwnoKhJjRJFCBYH27ztW+b6jKvnOvetnj30WA==";
+        url = "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.8.17.tgz";
+        sha512 = "uhywRrzJQxtpkowgDHdejIE911Pgt0raYOQUoFC/qREyQvXsz5DMj2J2JVjwcx2bpzbDdHRoP/lcWLE1Ol3vCQ==";
       };
     };
     "blob-0.0.2" = {
@@ -8158,6 +8176,15 @@ let
         sha1 = "b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb";
       };
     };
+    "bufferstreams-1.1.3" = {
+      name = "bufferstreams";
+      packageName = "bufferstreams";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bufferstreams/-/bufferstreams-1.1.3.tgz";
+        sha512 = "HaJnVuslRF4g2kSDeyl++AaVizoitCpL9PglzCYwy0uHHyvWerfvEb8jWmYbF1z4kiVFolGomnxSGl+GUQp2jg==";
+      };
+    };
     "bufferutil-1.3.0" = {
       name = "bufferutil";
       packageName = "bufferutil";
@@ -8662,6 +8689,15 @@ let
         sha1 = "50e21c1b0aa37729f9377def196b5a9cec932ee9";
       };
     };
+    "caryll-shapeops-0.3.1" = {
+      name = "caryll-shapeops";
+      packageName = "caryll-shapeops";
+      version = "0.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/caryll-shapeops/-/caryll-shapeops-0.3.1.tgz";
+        sha512 = "3TdH6DZGL08S6qEvCZLNaOHyFvmzQts8m+TyYEvc6/PiI+XgX5mIag1/CKczIM8e2QtDr8JKW8foo4VNOM8/Og==";
+      };
+    };
     "caseless-0.11.0" = {
       name = "caseless";
       packageName = "caseless";
@@ -9004,6 +9040,15 @@ let
         sha512 = "pmmkpIQRcnDA7EawKcg9+ncSZNTYfXqDx+K3oqqYvpZlqVBChjTomTfw+hePnkqYR3Y013818c0R1Q5P/7PGrQ==";
       };
     };
+    "child-process-promise-2.2.1" = {
+      name = "child-process-promise";
+      packageName = "child-process-promise";
+      version = "2.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/child-process-promise/-/child-process-promise-2.2.1.tgz";
+        sha1 = "4730a11ef610fad450b8f223c79d31d7bdad8074";
+      };
+    };
     "chloride-2.2.14" = {
       name = "chloride";
       packageName = "chloride";
@@ -9067,13 +9112,13 @@ let
         sha512 = "c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA==";
       };
     };
-    "chokidar-3.1.0" = {
+    "chokidar-3.1.1" = {
       name = "chokidar";
       packageName = "chokidar";
-      version = "3.1.0";
+      version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chokidar/-/chokidar-3.1.0.tgz";
-        sha512 = "6vZfo+7W0EOlbSo0nhVKMz4yyssrwiPbBZ8wj1lq8/+l4ZhGZ2U4Md7PspvmijXp1a26D3B7AHEBmIB7aVtaOQ==";
+        url = "https://registry.npmjs.org/chokidar/-/chokidar-3.1.1.tgz";
+        sha512 = "df4o16uZmMHzVQwECZRHwfguOt5ixpuQVaZHjYMvYisgKhE+JXwcj/Tcr3+3bu/XeOJQ9ycYmzu7Mv8XrGxJDQ==";
       };
     };
     "chownr-0.0.2" = {
@@ -9481,6 +9526,15 @@ let
         sha512 = "2WNImOvCRe6r63Gk9pShfkwXsVtKCroMAevIbiae021mS850UkWPbevxsBz3tnvjZIEGvlwaqCPsw+4ulzNgJA==";
       };
     };
+    "clipper-lib-1.0.0" = {
+      name = "clipper-lib";
+      packageName = "clipper-lib";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clipper-lib/-/clipper-lib-1.0.0.tgz";
+        sha1 = "e902ceb26e28ee5cfa6014abdf790a51efff4ecb";
+      };
+    };
     "cliss-0.0.2" = {
       name = "cliss";
       packageName = "cliss";
@@ -9976,6 +10030,15 @@ let
         sha512 = "mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==";
       };
     };
+    "colors-1.4.0" = {
+      name = "colors";
+      packageName = "colors";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz";
+        sha512 = "a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==";
+      };
+    };
     "colorspace-1.1.2" = {
       name = "colorspace";
       packageName = "colorspace";
@@ -10282,6 +10345,15 @@ let
         sha1 = "0162ec2d9351f5ddd59a9202cba935366a725080";
       };
     };
+    "complex.js-2.0.11" = {
+      name = "complex.js";
+      packageName = "complex.js";
+      version = "2.0.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/complex.js/-/complex.js-2.0.11.tgz";
+        sha512 = "6IArJLApNtdg1P1dFtn3dnyzoZBEF0MwMnrfF1exSBRpZYoy4yieMkpZhQDC0uwctw48vii0CFVyHfpgZ/DfGw==";
+      };
+    };
     "component-bind-1.0.0" = {
       name = "component-bind";
       packageName = "component-bind";
@@ -11290,6 +11362,15 @@ let
         sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==";
       };
     };
+    "cross-spawn-7.0.0" = {
+      name = "cross-spawn";
+      packageName = "cross-spawn";
+      version = "7.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.0.tgz";
+        sha512 = "6U/8SMK2FBNnB21oQ4+6Nsodxanw1gTkntYA2zBdkFYFu3ZDx65P2ONEXGSvob/QS6REjVHQ9zxzdOafwFdstw==";
+      };
+    };
     "cross-spawn-async-2.2.5" = {
       name = "cross-spawn-async";
       packageName = "cross-spawn-async";
@@ -11704,6 +11785,15 @@ let
         sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f";
       };
     };
+    "cubic2quad-1.1.1" = {
+      name = "cubic2quad";
+      packageName = "cubic2quad";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cubic2quad/-/cubic2quad-1.1.1.tgz";
+        sha1 = "69b19c61a3f5b41ecf2f1d5fae8fb03415aa8b15";
+      };
+    };
     "cucumber-html-reporter-3.0.4" = {
       name = "cucumber-html-reporter";
       packageName = "cucumber-html-reporter";
@@ -12271,6 +12361,15 @@ let
         sha1 = "80a4dd323748384bfa248083622aedec982adff3";
       };
     };
+    "decompress-response-4.2.1" = {
+      name = "decompress-response";
+      packageName = "decompress-response";
+      version = "4.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz";
+        sha512 = "jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==";
+      };
+    };
     "decompress-tar-4.1.1" = {
       name = "decompress-tar";
       packageName = "decompress-tar";
@@ -12541,13 +12640,13 @@ let
         sha1 = "2cef1f111e1c57870d8bbb8af2650e587cd2f5b4";
       };
     };
-    "deferred-leveldown-5.2.0" = {
+    "deferred-leveldown-5.2.1" = {
       name = "deferred-leveldown";
       packageName = "deferred-leveldown";
-      version = "5.2.0";
+      version = "5.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-5.2.0.tgz";
-        sha512 = "E1s224a+nv7nEZQL/s+q4ARzBhsfo3KiEjK3qdvDAvMfWE68GnGsMRYKanoZgYqq+LNgyRMYPzBgEmAXjM2i5g==";
+        url = "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-5.2.1.tgz";
+        sha512 = "PwXZRn5EmW+IKYVAYVc7G9FsRkShr0myPubPuq+mtLhDq9xSUqfvTlNZKoeQGeXACHXkeCFurKrz5oo6TZ3qwg==";
       };
     };
     "define-properties-1.1.3" = {
@@ -13207,6 +13306,15 @@ let
         sha1 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6";
       };
     };
+    "dockerfile-ast-0.0.12" = {
+      name = "dockerfile-ast";
+      packageName = "dockerfile-ast";
+      version = "0.0.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.0.12.tgz";
+        sha512 = "cIV8oXkAxpIuN5XgG0TGg07nLDgrj4olkfrdT77OTA3VypscsYHBUg/FjHxW9K3oA+CyH4Th/qtoMgTVpzSobw==";
+      };
+    };
     "dockerfile-ast-0.0.16" = {
       name = "dockerfile-ast";
       packageName = "dockerfile-ast";
@@ -13216,6 +13324,33 @@ let
         sha512 = "+HZToHjjiLPl46TqBrok5dMrg5oCkZFPSROMQjRmvin0zG4FxK0DJXTpV/CUPYY2zpmEvVza55XLwSHFx/xZMw==";
       };
     };
+    "dockerfile-language-service-0.0.8" = {
+      name = "dockerfile-language-service";
+      packageName = "dockerfile-language-service";
+      version = "0.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.0.8.tgz";
+        sha512 = "peko1rQtZ81e3QK3VLZgkCKkCMnuoSqZxCQuudyEbtYqqAe6jJ4r0bwOnWD9hyH/FMg7jMvI5uLsoo7/dHLNYw==";
+      };
+    };
+    "dockerfile-utils-0.0.11" = {
+      name = "dockerfile-utils";
+      packageName = "dockerfile-utils";
+      version = "0.0.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.0.11.tgz";
+        sha512 = "LNdPIgcl58343dF4KNCHvFzUScUhgLI9BRAR+Vln6D1tVBGvv1k5/qHuxWRCAM2uyFbj73QVkKMScXPhY7TqfQ==";
+      };
+    };
+    "dockerfile-utils-0.0.13" = {
+      name = "dockerfile-utils";
+      packageName = "dockerfile-utils";
+      version = "0.0.13";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.0.13.tgz";
+        sha512 = "+MAmhEnQ16B7+3C2UDWpmIS1D8EiKvpl4LDRjrMv94bOusaeRcLagRR0AvgV6NWT+oiRxDMLDyay6yjm6LESsw==";
+      };
+    };
     "doctrine-2.1.0" = {
       name = "doctrine";
       packageName = "doctrine";
@@ -13801,13 +13936,13 @@ let
         sha512 = "kS/gEPzZs3Y1rRsbGX4UOSjtP/CeJP0CxSNZHYxGfVM/VgLcv0ZqM7C45YyTj2DI2g7+P9Dd24C+IMIg6D0nYQ==";
       };
     };
-    "electron-to-chromium-1.3.260" = {
+    "electron-to-chromium-1.3.264" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.3.260";
+      version = "1.3.264";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.260.tgz";
-        sha512 = "wGt+OivF1C1MPwaSv3LJ96ebNbLAWlx3HndivDDWqwIVSQxmhL17Y/YmwUdEMtS/bPyommELt47Dct0/VZNQBQ==";
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.264.tgz";
+        sha512 = "z8E7WkrrquCuGYv+kKyybuZIbdms+4PeHp7Zm2uIgEhAigP0bOwqXILItwj0YO73o+QyHY/7XtEfP5DsHOWQgQ==";
       };
     };
     "elegant-spinner-1.0.1" = {
@@ -14081,6 +14216,15 @@ let
         sha512 = "AsaA9KG7cWPXWHp5FvHdDWY3AMWeZ8x+2pUVLcn71qE5AtAzgGbxuclOytygskw8XGmiQafTmnI9Bix3uihu2w==";
       };
     };
+    "engine.io-3.4.0" = {
+      name = "engine.io";
+      packageName = "engine.io";
+      version = "3.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/engine.io/-/engine.io-3.4.0.tgz";
+        sha512 = "XCyYVWzcHnK5cMz7G4VTu2W7zJS7SM1QkcelghyIk/FmobWBtXE7fwhBusEKvCSqc3bMh8fNFMlUkCKTFRxH2w==";
+      };
+    };
     "engine.io-client-1.3.1" = {
       name = "engine.io-client";
       packageName = "engine.io-client";
@@ -14108,6 +14252,15 @@ let
         sha512 = "y0CPINnhMvPuwtqXfsGuWE8BB66+B6wTtCofQDRecMQPYX3MYUZXFNKDhdrSe3EVjgOu4V3rxdeqN/Tr91IgbQ==";
       };
     };
+    "engine.io-client-3.4.0" = {
+      name = "engine.io-client";
+      packageName = "engine.io-client";
+      version = "3.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.4.0.tgz";
+        sha512 = "a4J5QO2k99CM2a0b12IznnyQndoEvtA4UAldhGzKqnHf42I3Qs2W5SPnDvatZRcMaNZs4IevVicBPayxYt6FwA==";
+      };
+    };
     "engine.io-parser-1.0.6" = {
       name = "engine.io-parser";
       packageName = "engine.io-parser";
@@ -14126,6 +14279,15 @@ let
         sha512 = "6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==";
       };
     };
+    "engine.io-parser-2.2.0" = {
+      name = "engine.io-parser";
+      packageName = "engine.io-parser";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.2.0.tgz";
+        sha512 = "6I3qD9iUxotsC5HEMuuGsKA0cXerGz+4uGcXQEkfBidgKf0amsjrrtwcbwK/nzpZBxclXlV7gGl9dgWvu4LF6w==";
+      };
+    };
     "enhanced-resolve-2.3.0" = {
       name = "enhanced-resolve";
       packageName = "enhanced-resolve";
@@ -14495,6 +14657,15 @@ let
         sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988";
       };
     };
+    "escape-latex-1.2.0" = {
+      name = "escape-latex";
+      packageName = "escape-latex";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/escape-latex/-/escape-latex-1.2.0.tgz";
+        sha512 = "nV5aVWW1K0wEiUIEdZ4erkGGH8mDxGyxSeqPzRNtWP7ataw+/olFObw7hujFWlVjNsaDFw5VZ5NzVSIqRgfTiw==";
+      };
+    };
     "escape-regexp-component-1.0.2" = {
       name = "escape-regexp-component";
       packageName = "escape-regexp-component";
@@ -14540,6 +14711,15 @@ let
         sha512 = "TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg==";
       };
     };
+    "escodegen-1.3.3" = {
+      name = "escodegen";
+      packageName = "escodegen";
+      version = "1.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz";
+        sha1 = "f024016f5a88e046fd12005055e939802e6c5f23";
+      };
+    };
     "escodegen-1.9.1" = {
       name = "escodegen";
       packageName = "escodegen";
@@ -14549,6 +14729,15 @@ let
         sha512 = "6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==";
       };
     };
+    "escope-1.0.3" = {
+      name = "escope";
+      packageName = "escope";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/escope/-/escope-1.0.3.tgz";
+        sha1 = "759dce8496c4248fec2d0caaf4108bcf3f1a7f5d";
+      };
+    };
     "escope-3.6.0" = {
       name = "escope";
       packageName = "escope";
@@ -14684,6 +14873,15 @@ let
         sha512 = "U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==";
       };
     };
+    "esmangle-1.0.1" = {
+      name = "esmangle";
+      packageName = "esmangle";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esmangle/-/esmangle-1.0.1.tgz";
+        sha1 = "d9bb37b8f8eafbf4e6d4ed6b7aa2956abbd3c4c2";
+      };
+    };
     "esniff-1.1.0" = {
       name = "esniff";
       packageName = "esniff";
@@ -14729,6 +14927,15 @@ let
         sha512 = "EYbr8XZUhWbYCqQRW0duU5LxzL5bETN6AjKBGy1302qqzPaCH10QbRg3Wvco79Z8x9WbiE8HYB4e75xl6qUYvQ==";
       };
     };
+    "esprima-1.1.1" = {
+      name = "esprima";
+      packageName = "esprima";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz";
+        sha1 = "5b6f1547f4d102e670e140c509be6771d6aeb549";
+      };
+    };
     "esprima-2.0.0" = {
       name = "esprima";
       packageName = "esprima";
@@ -14792,6 +14999,42 @@ let
         sha512 = "64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==";
       };
     };
+    "esshorten-1.1.1" = {
+      name = "esshorten";
+      packageName = "esshorten";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esshorten/-/esshorten-1.1.1.tgz";
+        sha1 = "174f96b7cc267e46872d814e7db7c290bdff61a9";
+      };
+    };
+    "estraverse-1.5.1" = {
+      name = "estraverse";
+      packageName = "estraverse";
+      version = "1.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz";
+        sha1 = "867a3e8e58a9f84618afb6c2ddbcd916b7cbaf71";
+      };
+    };
+    "estraverse-2.0.0" = {
+      name = "estraverse";
+      packageName = "estraverse";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/estraverse/-/estraverse-2.0.0.tgz";
+        sha1 = "5ae46963243600206674ccb24a09e16674fcdca1";
+      };
+    };
+    "estraverse-4.1.1" = {
+      name = "estraverse";
+      packageName = "estraverse";
+      version = "4.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/estraverse/-/estraverse-4.1.1.tgz";
+        sha1 = "f6caca728933a850ef90661d0e17982ba47111a2";
+      };
+    };
     "estraverse-4.3.0" = {
       name = "estraverse";
       packageName = "estraverse";
@@ -14819,6 +15062,15 @@ let
         sha512 = "SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==";
       };
     };
+    "esutils-1.0.0" = {
+      name = "esutils";
+      packageName = "esutils";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz";
+        sha1 = "8151d358e20c8acc7fb745e7472c0025fe496570";
+      };
+    };
     "esutils-2.0.3" = {
       name = "esutils";
       packageName = "esutils";
@@ -15656,6 +15908,15 @@ let
         sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2";
       };
     };
+    "fast-levenshtein-1.0.7" = {
+      name = "fast-levenshtein";
+      packageName = "fast-levenshtein";
+      version = "1.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.7.tgz";
+        sha1 = "0178dcdee023b92905193af0959e8a7639cfdcb9";
+      };
+    };
     "fast-levenshtein-2.0.6" = {
       name = "fast-levenshtein";
       packageName = "fast-levenshtein";
@@ -16349,13 +16610,13 @@ let
         sha512 = "ougBA2q6Rn9sZrjZQ9r5pTFxCotlGouySpD2yRIuq5AYwwfIT8HHhVMeSwrN5qJayjHINLJyrnsSkkPCZyfMrQ==";
       };
     };
-    "flow-parser-0.107.0" = {
+    "flow-parser-0.108.0" = {
       name = "flow-parser";
       packageName = "flow-parser";
-      version = "0.107.0";
+      version = "0.108.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.107.0.tgz";
-        sha512 = "GtMCS8qzP0VskiE5qfN4zYiwjnClV/BxPZ4zUqMRUfyaF+gBuLHDTPqVLJ4ndGedrdv54510rsXDSbkCqUig+g==";
+        url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.108.0.tgz";
+        sha512 = "Ug8VuwlyDIZq5Xgrf+T7XLpKydhqYyNd8lmFtf7PZbu90T5LL+FeHjWzxyrBn35RCCZMw7pXrjCrHOSs+2zXyg==";
       };
     };
     "fluent-ffmpeg-2.1.2" = {
@@ -16700,6 +16961,15 @@ let
         sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84";
       };
     };
+    "fraction.js-4.0.12" = {
+      name = "fraction.js";
+      packageName = "fraction.js";
+      version = "4.0.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fraction.js/-/fraction.js-4.0.12.tgz";
+        sha512 = "8Z1K0VTG4hzYY7kA/1sj4/r1/RWLBD3xwReT/RCrUCbzPszjNQCCsy3ktkU/eaEqX3MYa4pY37a52eiBlPMlhA==";
+      };
+    };
     "fragment-cache-0.2.1" = {
       name = "fragment-cache";
       packageName = "fragment-cache";
@@ -16898,6 +17168,15 @@ let
         sha512 = "66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==";
       };
     };
+    "fs-extra-6.0.1" = {
+      name = "fs-extra";
+      packageName = "fs-extra";
+      version = "6.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz";
+        sha512 = "GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==";
+      };
+    };
     "fs-extra-7.0.1" = {
       name = "fs-extra";
       packageName = "fs-extra";
@@ -17663,13 +17942,13 @@ let
         sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae";
       };
     };
-    "glob-parent-5.0.0" = {
+    "glob-parent-5.1.0" = {
       name = "glob-parent";
       packageName = "glob-parent";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.0.0.tgz";
-        sha512 = "Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg==";
+        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz";
+        sha512 = "qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==";
       };
     };
     "glob-stream-3.1.18" = {
@@ -17735,13 +18014,13 @@ let
         sha1 = "e76989268a6c74c38908b1305b10fc0e394e9d0f";
       };
     };
-    "global-agent-2.1.0" = {
+    "global-agent-2.1.1" = {
       name = "global-agent";
       packageName = "global-agent";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/global-agent/-/global-agent-2.1.0.tgz";
-        sha512 = "o5BKvbhjGKHFRMkw+xtZeTEyyHGDsdXaFvOHDQx6pzCURtIaznEL2URkXfp2xxzth8Y/6n9yysHXnjjLH6soBw==";
+        url = "https://registry.npmjs.org/global-agent/-/global-agent-2.1.1.tgz";
+        sha512 = "MjLP2o331SpSxBMBFSWxs5PaWDhjXxysHepQ/hmBCjhjw74cbO9R/IBCbaSJ4GLPKm01dRcgXBtRr7p7XZEnfg==";
       };
     };
     "global-dirs-0.1.1" = {
@@ -18060,6 +18339,15 @@ let
         sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658";
       };
     };
+    "graceful-fs-4.2.1" = {
+      name = "graceful-fs";
+      packageName = "graceful-fs";
+      version = "4.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.1.tgz";
+        sha512 = "b9usnbDGnD928gJB3LrCmxoibr3VE4U2SMo5PBuBnokWyDADTqDPXg4YpwKF1trpH+UbGp7QLicO3+aWEy0+mw==";
+      };
+    };
     "graceful-fs-4.2.2" = {
       name = "graceful-fs";
       packageName = "graceful-fs";
@@ -18132,13 +18420,13 @@ let
         sha512 = "QZ5BL8ZO/B20VA8APauGBg3GyEgZ19eduvpLWoq5x7gMmWnHoy8rlQWPLmWgFvo1yNgjSEFMesmS4R6pPr7xog==";
       };
     };
-    "graphql-14.5.6" = {
+    "graphql-14.5.7" = {
       name = "graphql";
       packageName = "graphql";
-      version = "14.5.6";
+      version = "14.5.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graphql/-/graphql-14.5.6.tgz";
-        sha512 = "zJ6Oz8P1yptV4O4DYXdArSwvmirPetDOBnGFRBl0zQEC68vNW3Ny8qo8VzMgfr+iC8PKiRYJ+f2wub41oDCoQg==";
+        url = "https://registry.npmjs.org/graphql/-/graphql-14.5.7.tgz";
+        sha512 = "as410RMJSUFqF8RcH2QWxZ5ioqHzsH9VWnWbaU+UnDXJ/6azMDIYPrtXCBPXd8rlunEVb7W8z6fuUnNHMbFu9A==";
       };
     };
     "graphql-anywhere-4.2.4" = {
@@ -18456,13 +18744,13 @@ let
         sha1 = "e28c4d45d05ecbbed818363ce8f9c5926229ffe5";
       };
     };
-    "handlebars-4.2.0" = {
+    "handlebars-4.2.1" = {
       name = "handlebars";
       packageName = "handlebars";
-      version = "4.2.0";
+      version = "4.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/handlebars/-/handlebars-4.2.0.tgz";
-        sha512 = "Kb4xn5Qh1cxAKvQnzNWZ512DhABzyFNmsaJf3OAkWNa4NkaqWcNI8Tao8Tasi0/F4JD9oyG0YxuFyvyR57d+Gw==";
+        url = "https://registry.npmjs.org/handlebars/-/handlebars-4.2.1.tgz";
+        sha512 = "bqPIlDk06UWbVEIFoYj+LVo42WhK96J+b25l7hbFDpxrOXMphFM3fNIm+cluwg4Pk2jiLjWU5nHQY7igGE75NQ==";
       };
     };
     "har-schema-1.0.5" = {
@@ -19330,6 +19618,15 @@ let
         sha512 = "Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==";
       };
     };
+    "http-proxy-1.18.0" = {
+      name = "http-proxy";
+      packageName = "http-proxy";
+      version = "1.18.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.0.tgz";
+        sha512 = "84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==";
+      };
+    };
     "http-proxy-agent-2.1.0" = {
       name = "http-proxy-agent";
       packageName = "http-proxy-agent";
@@ -19609,15 +19906,6 @@ let
         sha512 = "4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==";
       };
     };
-    "ieee754-1.1.8" = {
-      name = "ieee754";
-      packageName = "ieee754";
-      version = "1.1.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz";
-        sha1 = "be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4";
-      };
-    };
     "iferr-0.1.5" = {
       name = "iferr";
       packageName = "iferr";
@@ -20095,6 +20383,15 @@ let
         sha512 = "cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==";
       };
     };
+    "inquirer-7.0.0" = {
+      name = "inquirer";
+      packageName = "inquirer";
+      version = "7.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inquirer/-/inquirer-7.0.0.tgz";
+        sha512 = "rSdC7zelHdRQFkWnhsMu2+2SO41mpv2oF2zy4tMhmiLWkcKbOAs87fWAJhVXttKVwhdZvymvnuM95EyEXg2/tQ==";
+      };
+    };
     "inquirer-autocomplete-prompt-1.0.1" = {
       name = "inquirer-autocomplete-prompt";
       packageName = "inquirer-autocomplete-prompt";
@@ -21427,13 +21724,13 @@ let
         sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d";
       };
     };
-    "is-wsl-2.1.0" = {
+    "is-wsl-2.1.1" = {
       name = "is-wsl";
       packageName = "is-wsl";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-wsl/-/is-wsl-2.1.0.tgz";
-        sha512 = "pFTjpv/x5HRj8kbZ/Msxi9VrvtOMRBqaDi3OIcbwPI3OuH+r3lLxVWukLITBaOGJIbA/w2+M1eVmVa4XNQlAmQ==";
+        url = "https://registry.npmjs.org/is-wsl/-/is-wsl-2.1.1.tgz";
+        sha512 = "umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog==";
       };
     };
     "is-yarn-global-0.3.0" = {
@@ -21679,6 +21976,15 @@ let
         sha512 = "F4y4rQ7RTYFDu6QGsFXOnrZb2Pk6BvhnecOZQZvM+BmNahgE+5y9mfToMe4SsELuJ7NQM5JF+Oau1u/xwefr9A==";
       };
     };
+    "javascript-natural-sort-0.7.1" = {
+      name = "javascript-natural-sort";
+      packageName = "javascript-natural-sort";
+      version = "0.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz";
+        sha1 = "f9e2303d4507f6d74355a73664d1440fb5a0ef59";
+      };
+    };
     "javascript-stringify-1.6.0" = {
       name = "javascript-stringify";
       packageName = "javascript-stringify";
@@ -23084,13 +23390,13 @@ let
         sha512 = "SBSR60x+dghhwGUxPKS+BvV1xNqnwsEUBKmnFepPaHJ6VkBXyPK9SImGc3K2BkwBfpxlt7GKkBNlCnrdufsejA==";
       };
     };
-    "leveldown-5.2.0" = {
+    "leveldown-5.2.1" = {
       name = "leveldown";
       packageName = "leveldown";
-      version = "5.2.0";
+      version = "5.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/leveldown/-/leveldown-5.2.0.tgz";
-        sha512 = "Ml6mWFqhhyUbuJUVaOd6ZVBHA5T0XLOK0cwNRIBEDJCjBiJBM3fpi4gdTIhU5/tWqtxMFMQbmo/U7a9rbA1stg==";
+        url = "https://registry.npmjs.org/leveldown/-/leveldown-5.2.1.tgz";
+        sha512 = "369I1rGibXV7CIoLhsSpp/ExwQucI3xUe0RXQrMu4ji6OG9PFMVAQuzsEXKwAi3BWsjFzcFtodAP8MW5fmfung==";
       };
     };
     "levelup-0.19.1" = {
@@ -23129,6 +23435,15 @@ let
         sha1 = "3911737a9cb56da345d008f55782c6f138979ba3";
       };
     };
+    "levn-0.2.5" = {
+      name = "levn";
+      packageName = "levn";
+      version = "0.2.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/levn/-/levn-0.2.5.tgz";
+        sha1 = "ba8d339d0ca4a610e3a3f145b9caf48807155054";
+      };
+    };
     "levn-0.3.0" = {
       name = "levn";
       packageName = "levn";
@@ -23201,6 +23516,15 @@ let
         sha512 = "QE9Q+FxLLGdJRiJTuC2GB3LEHZeHX/VcbMQeNPdAixEKo86JPy6bOWND1XmMLu0tjWUu0xIY0YpJYQApxIZwbQ==";
       };
     };
+    "libspiro-js-0.3.1" = {
+      name = "libspiro-js";
+      packageName = "libspiro-js";
+      version = "0.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/libspiro-js/-/libspiro-js-0.3.1.tgz";
+        sha1 = "86652b0009a6d84ea79a5320bdca5f00612ee439";
+      };
+    };
     "lie-3.3.0" = {
       name = "lie";
       packageName = "lie";
@@ -25326,6 +25650,15 @@ let
         sha256 = "a4d1a272ec79367f3e4515d1cbd9bbe3f77687aa17443398288e91a6f23b1241";
       };
     };
+    "mathjs-5.10.3" = {
+      name = "mathjs";
+      packageName = "mathjs";
+      version = "5.10.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mathjs/-/mathjs-5.10.3.tgz";
+        sha512 = "ySjg30BC3dYjQm73ILZtwcWzFJde0VU6otkXW/57IjjuYRa3Qaf0Kb8pydEuBZYtqW2OxreAtsricrAmOj3jIw==";
+      };
+    };
     "md5-2.2.1" = {
       name = "md5";
       packageName = "md5";
@@ -25479,6 +25812,24 @@ let
         sha512 = "fqm86UwHvAnneIv40Uy1sDQaFtAByq/k0SQ3uCtbnEeSQNT1s5TDHCZOD1VmYCHwfY1jL2NjoZVwzZKYqy3L7A==";
       };
     };
+    "megaminx-0.3.3" = {
+      name = "megaminx";
+      packageName = "megaminx";
+      version = "0.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/megaminx/-/megaminx-0.3.3.tgz";
+        sha512 = "lZBSLMro+XYJIix9zCZ8N6nZgixpjUPkX6CKuh+Y9Wl9bir/2Fp27NWapA0cNQCPrzOOI9sAwxc4BI14aIdumw==";
+      };
+    };
+    "megaminx-0.9.0" = {
+      name = "megaminx";
+      packageName = "megaminx";
+      version = "0.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/megaminx/-/megaminx-0.9.0.tgz";
+        sha512 = "1UcxrUXXYboLWS3AJ2NuLckLi3YR7eJiO5LsYAWHZjYE0mmSqJ2ogSt6JrG8YINyogW9/TUWpL1ojwbRsSbyXw==";
+      };
+    };
     "mem-1.1.0" = {
       name = "mem";
       packageName = "mem";
@@ -25956,6 +26307,15 @@ let
         sha512 = "j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==";
       };
     };
+    "mimic-response-2.0.0" = {
+      name = "mimic-response";
+      packageName = "mimic-response";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mimic-response/-/mimic-response-2.0.0.tgz";
+        sha512 = "8ilDoEapqA4uQ3TwS0jakGONKXVJqpy+RpM+3b7pLdOjghCrEiGp9SRkFbUHAmZW9vdnrENWHjaweIoTIJExSQ==";
+      };
+    };
     "min-document-2.19.0" = {
       name = "min-document";
       packageName = "min-document";
@@ -26091,13 +26451,13 @@ let
         sha512 = "oP88Dw3LK/pdrKyMdlbmg3W50969UNr4ctISzJfPl+YPYHTAOrS+dihXnsgRNKSRIzDsrnV3eE2CCVlZbpOKdQ==";
       };
     };
-    "minipass-2.6.2" = {
+    "minipass-2.8.1" = {
       name = "minipass";
       packageName = "minipass";
-      version = "2.6.2";
+      version = "2.8.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minipass/-/minipass-2.6.2.tgz";
-        sha512 = "38Jwdc8AttUDaQAIRX8Iaw3QoCDWjAwKMGeGDF9JUi9QCPMjH5qAQg/hdO8o1nC7Nmh1/CqzMg5FQPEKuKwznQ==";
+        url = "https://registry.npmjs.org/minipass/-/minipass-2.8.1.tgz";
+        sha512 = "QCG523ParRcE2+9A6wYh9UI3uy2FFLw4DQaVYQrY5HPfszc5M6VDD+j0QCwHm19LI2imes4RB+NBD8cOJccyCg==";
       };
     };
     "minitouch-prebuilt-1.2.0" = {
@@ -27653,6 +28013,15 @@ let
         sha512 = "sol30LUpz1jQFBjOKwbjxijiE3b6pjd74YwfD0fJOKPjF+fONKb2Yg8rYgS6+bK6VDl+/wfr4IYpC7jDzLUIfw==";
       };
     };
+    "node-gyp-3.8.0" = {
+      name = "node-gyp";
+      packageName = "node-gyp";
+      version = "3.8.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz";
+        sha512 = "3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==";
+      };
+    };
     "node-gyp-5.0.3" = {
       name = "node-gyp";
       packageName = "node-gyp";
@@ -27914,6 +28283,15 @@ let
         sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907";
       };
     };
+    "node-version-1.2.0" = {
+      name = "node-version";
+      packageName = "node-version";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-version/-/node-version-1.2.0.tgz";
+        sha512 = "ma6oU4Sk0qOoKEAymVoTvk8EdXEobdS7m/mAGhDJ8Rouugho48crHBORAmy5BoOcv8wraPM6xumapQp5hl4iIQ==";
+      };
+    };
     "node-wsfederation-0.1.1" = {
       name = "node-wsfederation";
       packageName = "node-wsfederation";
@@ -28121,13 +28499,13 @@ let
         sha512 = "U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==";
       };
     };
-    "normalize-url-4.3.0" = {
+    "normalize-url-4.4.1" = {
       name = "normalize-url";
       packageName = "normalize-url";
-      version = "4.3.0";
+      version = "4.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.3.0.tgz";
-        sha512 = "0NLtR71o4k6GLP+mr6Ty34c5GA6CMoEsncKJxvQd8NzPxaHRJNnb5gZE8R1XF4CPIS7QPHLJ74IFszwtNVAHVQ==";
+        url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.4.1.tgz";
+        sha512 = "rjH3yRt0Ssx19mUwS0hrDUOdG9VI+oRLpLHJ7tXRdjcuQ7v7wo6qPvOZppHRrqfslTKr0L2yBhjj4UXd7c3cQg==";
       };
     };
     "now-and-later-2.0.1" = {
@@ -28184,13 +28562,13 @@ let
         sha1 = "99b85aec29fcb388d2dd351f0013bf5268787e67";
       };
     };
-    "npm-lifecycle-3.1.3" = {
+    "npm-lifecycle-3.1.4" = {
       name = "npm-lifecycle";
       packageName = "npm-lifecycle";
-      version = "3.1.3";
+      version = "3.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-3.1.3.tgz";
-        sha512 = "M0QmmqbEHBXxDrmc6X3+eKjW9+F7Edg1ENau92WkYw1sox6wojHzEZJIRm1ItljEiaigZlKL8mXni/4ylAy1Dg==";
+        url = "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-3.1.4.tgz";
+        sha512 = "tgs1PaucZwkxECGKhC/stbEgFyc3TGh2TJcg2CDr6jbvQRdteHNhmMeljRzpe4wgFAXQADoy1cSqqi7mtiAa5A==";
       };
     };
     "npm-package-arg-6.1.0" = {
@@ -29085,6 +29463,15 @@ let
         sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686";
       };
     };
+    "optionator-0.3.0" = {
+      name = "optionator";
+      packageName = "optionator";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/optionator/-/optionator-0.3.0.tgz";
+        sha1 = "9715a8b5f5e7586cff06c8249e039cd7364d3f54";
+      };
+    };
     "optionator-0.8.2" = {
       name = "optionator";
       packageName = "optionator";
@@ -29274,6 +29661,15 @@ let
         sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==";
       };
     };
+    "otfcc-ttcize-0.8.0" = {
+      name = "otfcc-ttcize";
+      packageName = "otfcc-ttcize";
+      version = "0.8.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/otfcc-ttcize/-/otfcc-ttcize-0.8.0.tgz";
+        sha512 = "0RFgy9TDsgTF/1UJ8bSQ4heTYRatDz3HOXXh8d3WyXReqeOU+edgkbG4ERMFPdzFnA+SgqKTnPRg+2pduZsmSQ==";
+      };
+    };
     "p-any-1.1.0" = {
       name = "p-any";
       packageName = "p-any";
@@ -29490,13 +29886,13 @@ let
         sha512 = "88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==";
       };
     };
-    "p-timeout-3.1.0" = {
+    "p-timeout-3.2.0" = {
       name = "p-timeout";
       packageName = "p-timeout";
-      version = "3.1.0";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/p-timeout/-/p-timeout-3.1.0.tgz";
-        sha512 = "C27DYI+tCroT8J8cTEyySGydl2B7FlxrGNF5/wmMbl1V+jeehUCzEE/BVgzRebdm2K3ZitKOKx8YbdFumDyYmw==";
+        url = "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz";
+        sha512 = "rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==";
       };
     };
     "p-try-1.0.0" = {
@@ -29697,13 +30093,13 @@ let
         sha1 = "fedd4d2bf193a77745fe71e371d73c3307d9c751";
       };
     };
-    "parse-asn1-5.1.4" = {
+    "parse-asn1-5.1.5" = {
       name = "parse-asn1";
       packageName = "parse-asn1";
-      version = "5.1.4";
+      version = "5.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz";
-        sha512 = "Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==";
+        url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz";
+        sha512 = "jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==";
       };
     };
     "parse-english-4.1.2" = {
@@ -30111,6 +30507,15 @@ let
         sha1 = "fad9db6ae252f8b088e0c5decd20a7da0c5d9f1e";
       };
     };
+    "patel-0.33.1" = {
+      name = "patel";
+      packageName = "patel";
+      version = "0.33.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/patel/-/patel-0.33.1.tgz";
+        sha512 = "zOv5DhGH2r4cRKnZfOlHmWqxBp9nMGnC3F/NZbUqFCYMA65RXiv8q1F96/6dm2ANR6xvCe+xLODQSb49IFoYQg==";
+      };
+    };
     "path-browserify-0.0.1" = {
       name = "path-browserify";
       packageName = "path-browserify";
@@ -30210,6 +30615,15 @@ let
         sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40";
       };
     };
+    "path-key-3.1.0" = {
+      name = "path-key";
+      packageName = "path-key";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-key/-/path-key-3.1.0.tgz";
+        sha512 = "8cChqz0RP6SHJkMt48FW0A7+qUOn+OsnOsVtzI59tZ8m+5bCSk7hzwET0pulwOM2YMn9J1efb07KB9l9f30SGg==";
+      };
+    };
     "path-loader-1.0.10" = {
       name = "path-loader";
       packageName = "path-loader";
@@ -30336,6 +30750,24 @@ let
         sha1 = "b942e6d4bde653005ef6b71361def8727d0645e0";
       };
     };
+    "patrisika-0.21.0" = {
+      name = "patrisika";
+      packageName = "patrisika";
+      version = "0.21.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/patrisika/-/patrisika-0.21.0.tgz";
+        sha1 = "b82c27f7d4041522dc5c31b43b7c6efb19e47482";
+      };
+    };
+    "patrisika-scopes-0.11.1" = {
+      name = "patrisika-scopes";
+      packageName = "patrisika-scopes";
+      version = "0.11.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/patrisika-scopes/-/patrisika-scopes-0.11.1.tgz";
+        sha512 = "UCIBMx1nzNaR5CcDoQ9/jtY5RlJqf2CrJYHiMZJhi15NPvsPKRfJT/DPZMkhCunexOKmH03EDZYZU1hGn7mL0w==";
+      };
+    };
     "pause-0.0.1" = {
       name = "pause";
       packageName = "pause";
@@ -31363,6 +31795,15 @@ let
         sha512 = "G2gJwLzLcYS+2m6bTAe+CcDpwak9YpcvpScI0tE4WYb2O3lEZD/YywkMNpGqsSx5wttGvh2UXaKROTKKCyM2dw==";
       };
     };
+    "primitive-quadify-off-curves-0.4.1" = {
+      name = "primitive-quadify-off-curves";
+      packageName = "primitive-quadify-off-curves";
+      version = "0.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/primitive-quadify-off-curves/-/primitive-quadify-off-curves-0.4.1.tgz";
+        sha512 = "Kmn+IfF+hcARb1NX+XtoSQIxHS+WeOqqQ3YDihRe3KkvGkFxMrDQFFsDTXxwUOt9KmvD7FgWG6cO2ajZp4lEQg==";
+      };
+    };
     "printf-0.2.5" = {
       name = "printf";
       packageName = "printf";
@@ -31561,6 +32002,15 @@ let
         sha1 = "bbcfd248725259f2bb115a27bfa8d65dc420f931";
       };
     };
+    "promise-polyfill-6.1.0" = {
+      name = "promise-polyfill";
+      packageName = "promise-polyfill";
+      version = "6.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.1.0.tgz";
+        sha1 = "dfa96943ea9c121fca4de9b5868cb39d3472e057";
+      };
+    };
     "promise-queue-2.2.5" = {
       name = "promise-queue";
       packageName = "promise-queue";
@@ -31651,6 +32101,15 @@ let
         sha1 = "159fb06193d32003f4b3691dd2ec1a634aa80d1d";
       };
     };
+    "proper-lockfile-3.2.0" = {
+      name = "proper-lockfile";
+      packageName = "proper-lockfile";
+      version = "3.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-3.2.0.tgz";
+        sha512 = "iMghHHXv2bsxl6NchhEaFck8tvX3F9cknEEh1SUpguUOBjN7PAAW9BLzmbc1g/mCD1gY3EE2EABBHPJfFdHFmA==";
+      };
+    };
     "properties-1.2.1" = {
       name = "properties";
       packageName = "properties";
@@ -32722,13 +33181,13 @@ let
         sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==";
       };
     };
-    "qs-6.8.0" = {
+    "qs-6.9.0" = {
       name = "qs";
       packageName = "qs";
-      version = "6.8.0";
+      version = "6.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.8.0.tgz";
-        sha512 = "tPSkj8y92PfZVbinY1n84i1Qdx75lZjMQYx9WZhnkofyxzw2r7Ho39G3/aEvSUdebxpnnM4LZJCtvE/Aq3+s9w==";
+        url = "https://registry.npmjs.org/qs/-/qs-6.9.0.tgz";
+        sha512 = "27RP4UotQORTpmNQDX8BHPukOnBP3p1uUJY5UnDhaJB+rMt9iMsok724XL+UHU23bEFOHRMQ2ZhI99qOWUMGFA==";
       };
     };
     "query-string-1.0.1" = {
@@ -35170,6 +35629,15 @@ let
         sha1 = "f0c82d98a3b139a8776a8808050b824431087fca";
       };
     };
+    "seed-random-2.2.0" = {
+      name = "seed-random";
+      packageName = "seed-random";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/seed-random/-/seed-random-2.2.0.tgz";
+        sha1 = "2a9b19e250a817099231a5b99a4daf80b7fbed54";
+      };
+    };
     "seek-bzip-1.0.5" = {
       name = "seek-bzip";
       packageName = "seek-bzip";
@@ -35908,13 +36376,13 @@ let
         sha512 = "lSSHRSw3mQNUGPAYRqo7xy9dhKmxFXIjLjp4KHpf99GEH2VH7C3AM+Qfx6du6jhfUi6Vm7XnbEVEf7Wb6N8jRw==";
       };
     };
-    "simple-get-3.0.3" = {
+    "simple-get-3.1.0" = {
       name = "simple-get";
       packageName = "simple-get";
-      version = "3.0.3";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-get/-/simple-get-3.0.3.tgz";
-        sha512 = "Wvre/Jq5vgoz31Z9stYWPLn0PqRqmBDpFSdypAnHu5AvRVCYPRYGnvryNLiXu8GOBNDH82J2FRHUGMjjHUpXFw==";
+        url = "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz";
+        sha512 = "bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==";
       };
     };
     "simple-git-1.126.0" = {
@@ -35944,13 +36412,13 @@ let
         sha1 = "4e421f485ac7b13b08077a4476934d52c5ba3bb3";
       };
     };
-    "simple-peer-9.5.0" = {
+    "simple-peer-9.6.0" = {
       name = "simple-peer";
       packageName = "simple-peer";
-      version = "9.5.0";
+      version = "9.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.5.0.tgz";
-        sha512 = "3tROq3nBo/CIZI8PWlXGbAxQIlQF6KQ/zcd4lQ2pAC4+rPiV7E721hI22nTO54uw/nzb2HKbvmDtZ4Wr173+vA==";
+        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.6.0.tgz";
+        sha512 = "NYqSKPu75xhkZYKGJhCbLCG5kfBtDHf8U9ddk4EKFfYNU7XgIisov+V8wMbVVgyMCfn8pm8uOqQQmE50FPDFWA==";
       };
     };
     "simple-sha1-2.1.2" = {
@@ -36241,13 +36709,13 @@ let
         sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198";
       };
     };
-    "snyk-1.227.0" = {
+    "snyk-1.228.3" = {
       name = "snyk";
       packageName = "snyk";
-      version = "1.227.0";
+      version = "1.228.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk/-/snyk-1.227.0.tgz";
-        sha512 = "ejfq2FIca+b/zu4hkJwFUob1Emn+s9wXYw5VHJSS6BjiniNi6dIa24AARG3BWiVsN/3NvzCYAkcqhYGaJ6xyVw==";
+        url = "https://registry.npmjs.org/snyk/-/snyk-1.228.3.tgz";
+        sha512 = "TwyJcMXBvic1xJ+rVLdIYS1xDYuzcogIXdmyvGvXBZgwIQdjOVMnZBVxUo5igkOIntBL2sCynZiydQtGbe08JA==";
       };
     };
     "snyk-config-2.2.3" = {
@@ -36286,13 +36754,13 @@ let
         sha512 = "9hsGgloioGuey5hbZfv+MkFEslxXHyzUlaAazcR0NsY7VLyG/b2g3f88f/ZwCwlWaKL9LMv/ERIiey3oWAB/qg==";
       };
     };
-    "snyk-gradle-plugin-3.0.2" = {
+    "snyk-gradle-plugin-3.1.0" = {
       name = "snyk-gradle-plugin";
       packageName = "snyk-gradle-plugin";
-      version = "3.0.2";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.0.2.tgz";
-        sha512 = "9nyR03kHmePqBGaQiUeo3RD1YJ4qE5/V4tOmDQ8LNjHTQ54Xr8OXFC5xlJMV8FCtXrRXY0/WX8RMUPEUAm4c9g==";
+        url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.1.0.tgz";
+        sha512 = "789Rqyhv1+WYbfy1Qilgsw0FMccedSaCO5n+54CXXGVUZWMsVvqJj3T8k7+vis+9Eq+Sgbdzti8vDtApz6rWWQ==";
       };
     };
     "snyk-module-1.9.1" = {
@@ -36439,6 +36907,15 @@ let
         sha512 = "wxXrIuZ8AILcn+f1B4ez4hJTPG24iNgxBBDaJfT6MsyOhVYiTXWexGoPkd87ktJG8kQEcL/NBvRi64+9k4Kc0w==";
       };
     };
+    "socket.io-2.3.0" = {
+      name = "socket.io";
+      packageName = "socket.io";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io/-/socket.io-2.3.0.tgz";
+        sha512 = "2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg==";
+      };
+    };
     "socket.io-adapter-0.2.0" = {
       name = "socket.io-adapter";
       packageName = "socket.io-adapter";
@@ -36484,6 +36961,15 @@ let
         sha512 = "56ZrkTDbdTLmBIyfFYesgOxsjcLnwAKoN4CiPyTVkMQj3zTUh0QAx3GbvIvLpFEOvQWu92yyWICxB0u7wkVbYA==";
       };
     };
+    "socket.io-client-2.3.0" = {
+      name = "socket.io-client";
+      packageName = "socket.io-client";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.3.0.tgz";
+        sha512 = "cEQQf24gET3rfhxZ2jJ5xzAOo/xhZwK+mOqtGRg5IowZsMgwvHwnf/mCRapAAkadhM26y+iydgwsXGObBB5ZdA==";
+      };
+    };
     "socket.io-parser-2.1.2" = {
       name = "socket.io-parser";
       packageName = "socket.io-parser";
@@ -36520,6 +37006,15 @@ let
         sha512 = "hczmV6bDgdaEbVqhAeVMM/jfUfzuEZHsQg6eOmLgJht6G3mPKMxYm75w2+qhAQZ+4X+1+ATZ+QFKeOZD5riHng==";
       };
     };
+    "socket.io-parser-3.4.0" = {
+      name = "socket.io-parser";
+      packageName = "socket.io-parser";
+      version = "3.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.4.0.tgz";
+        sha512 = "/G/VOI+3DBp0+DJKW4KesGnQkQPFmUCbA/oO2QGT6CWxU7hLGWqU3tyuzeSK/dqcyeHsQg1vTe9jiZI8GU9SCQ==";
+      };
+    };
     "socks-2.3.2" = {
       name = "socks";
       packageName = "socks";
@@ -38329,6 +38824,15 @@ let
         sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3";
       };
     };
+    "strip-bom-buf-1.0.0" = {
+      name = "strip-bom-buf";
+      packageName = "strip-bom-buf";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-bom-buf/-/strip-bom-buf-1.0.0.tgz";
+        sha1 = "1cb45aaf57530f4caf86c7f75179d2c9a51dd572";
+      };
+    };
     "strip-bom-buf-2.0.0" = {
       name = "strip-bom-buf";
       packageName = "strip-bom-buf";
@@ -38347,6 +38851,15 @@ let
         sha1 = "f87db5ef2613f6968aa545abfe1ec728b6a829ca";
       };
     };
+    "strip-bom-stream-3.0.0" = {
+      name = "strip-bom-stream";
+      packageName = "strip-bom-stream";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-3.0.0.tgz";
+        sha1 = "956bcc5d84430f69256a90ed823765cd858e159c";
+      };
+    };
     "strip-bom-stream-4.0.0" = {
       name = "strip-bom-stream";
       packageName = "strip-bom-stream";
@@ -39059,13 +39572,13 @@ let
         sha512 = "FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==";
       };
     };
-    "tar-4.4.10" = {
+    "tar-4.4.11" = {
       name = "tar";
       packageName = "tar";
-      version = "4.4.10";
+      version = "4.4.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar/-/tar-4.4.10.tgz";
-        sha512 = "g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==";
+        url = "https://registry.npmjs.org/tar/-/tar-4.4.11.tgz";
+        sha512 = "iI4zh3ktLJKaDNZKZc+fUONiQrSn9HkCFzamtb7k8FFmVilHVob7QsLX/VySAW8lAviMzMbFw4QtFb4errwgYA==";
       };
     };
     "tar-fs-2.0.0" = {
@@ -39581,13 +40094,13 @@ let
         sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f";
       };
     };
-    "timeout-refresh-1.0.0" = {
+    "timeout-refresh-1.0.1" = {
       name = "timeout-refresh";
       packageName = "timeout-refresh";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/timeout-refresh/-/timeout-refresh-1.0.0.tgz";
-        sha512 = "y5ajDPPtyhumr7xRnQgOMMVR5/EXMCVHPwM7RWnMUZx9UzT8FGRBtwG4/rh2AWHkDr7JR8dBHU6NDGx7tEiEAg==";
+        url = "https://registry.npmjs.org/timeout-refresh/-/timeout-refresh-1.0.1.tgz";
+        sha512 = "bW5oSShdwFCN9K7RpB5dkq5bqNlGt8Lwbfxr8vprysk8hDiK5yy7Mgf2Qlz2ssE0gfQfoYhk4VLY9Hhsnr9Ulw==";
       };
     };
     "timers-browserify-1.4.2" = {
@@ -40004,6 +40517,15 @@ let
         sha512 = "ePZfjs1ajL4b8jT4MeVId+9Ci5hJCzAtNIEXIHyFYmKmQuX+eHC/RNv6tuLMUhrGrhJ+sYWW/lBF/LKILHGZEA==";
       };
     };
+    "topsort-0.0.2" = {
+      name = "topsort";
+      packageName = "topsort";
+      version = "0.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/topsort/-/topsort-0.0.2.tgz";
+        sha1 = "2e5e0ee8a1439417f101d5b9b2d035e620263321";
+      };
+    };
     "torrent-discovery-5.4.0" = {
       name = "torrent-discovery";
       packageName = "torrent-discovery";
@@ -40355,6 +40877,15 @@ let
         sha512 = "5LpRN+mTiCs7lI5EtbXmF/HfMeCjzt7DH9CZwtkr6SywStrNQC723wG+aOWFiLNn7zT3kD/RnFqi3ZUfr4l5Qw==";
       };
     };
+    "ts-process-promises-1.0.2" = {
+      name = "ts-process-promises";
+      packageName = "ts-process-promises";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ts-process-promises/-/ts-process-promises-1.0.2.tgz";
+        sha512 = "6qWWz2HdFbD2uAfgS5t65Dd6HQKYjfra+YXQzKzxIG+RKTpoeDi+x+TW85SEF3cWUI2UecrOXJobvD+04MiTZg==";
+      };
+    };
     "tslib-1.10.0" = {
       name = "tslib";
       packageName = "tslib";
@@ -40400,6 +40931,24 @@ let
         sha512 = "g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==";
       };
     };
+    "ttf2woff-2.0.1" = {
+      name = "ttf2woff";
+      packageName = "ttf2woff";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ttf2woff/-/ttf2woff-2.0.1.tgz";
+        sha1 = "871832240024b09db9570904c7c1928b8057c969";
+      };
+    };
+    "ttf2woff2-2.0.3" = {
+      name = "ttf2woff2";
+      packageName = "ttf2woff2";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ttf2woff2/-/ttf2woff2-2.0.3.tgz";
+        sha1 = "5e020afe6e643287f3ad7687abed20fe654eb329";
+      };
+    };
     "ttl-1.3.1" = {
       name = "ttl";
       packageName = "ttl";
@@ -40535,13 +41084,13 @@ let
         sha512 = "/XrQjW0e5Z915m1A0qeXD9tSLDmz8zGjR6imhGDme6rMtXYudFpXXhaToKnM52nPPCNdCh6YQsLLkwbbkFvzVA==";
       };
     };
-    "type-1.0.3" = {
+    "type-1.2.0" = {
       name = "type";
       packageName = "type";
-      version = "1.0.3";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/type/-/type-1.0.3.tgz";
-        sha512 = "51IMtNfVcee8+9GJvj0spSuFcZHe9vSib6Xtgsny1Km9ugyz2mbS08I3rsUIRYgJohFRFU1160sgRodYz378Hg==";
+        url = "https://registry.npmjs.org/type/-/type-1.2.0.tgz";
+        sha512 = "+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==";
       };
     };
     "type-check-0.3.2" = {
@@ -40607,6 +41156,15 @@ let
         sha512 = "4LHc1KMNJ6NDGO+dSM/yNfZQRtp8NN7psYrPHUblD62Dvkwsp3VShsbM78kOgpcmMkRTgvwdKOTjctS+uMllgQ==";
       };
     };
+    "typed-function-1.1.0" = {
+      name = "typed-function";
+      packageName = "typed-function";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typed-function/-/typed-function-1.1.0.tgz";
+        sha512 = "TuQzwiT4DDg19beHam3E66oRXhyqlyfgjHB/5fcvsRXbfmWPJfto9B4a0TBdTrQAPGlGmXh/k7iUI+WsObgORA==";
+      };
+    };
     "typedarray-0.0.6" = {
       name = "typedarray";
       packageName = "typedarray";
@@ -40706,6 +41264,15 @@ let
         sha1 = "5c080e5d661cbbe38259d2e70a3c7253e873881d";
       };
     };
+    "typo-geom-0.5.1" = {
+      name = "typo-geom";
+      packageName = "typo-geom";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typo-geom/-/typo-geom-0.5.1.tgz";
+        sha512 = "nj81m0eqRMpK6NcwkGlT9r3CbwjCQhsFU6SBUuYW9TDveqIdi/QUFGkikoImtE1C6OzY2LvuVMSG8rx/ZTCGtQ==";
+      };
+    };
     "ua-parser-js-0.7.20" = {
       name = "ua-parser-js";
       packageName = "ua-parser-js";
@@ -41417,6 +41984,15 @@ let
         sha512 = "eUmNTPzdx+q/WvOHW0bgGYLWvWHNT3PTKEQLg0MAQhc0AHASHVHoP/9YytYd4RBVariqno/mEUhVZN98CmD7bg==";
       };
     };
+    "unorm-1.6.0" = {
+      name = "unorm";
+      packageName = "unorm";
+      version = "1.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unorm/-/unorm-1.6.0.tgz";
+        sha512 = "b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA==";
+      };
+    };
     "unpack-string-0.0.2" = {
       name = "unpack-string";
       packageName = "unpack-string";
@@ -42272,6 +42848,15 @@ let
         sha512 = "fOi47nsJP5Wqefa43kyWSg80qF+Q3XA6MUkgi7Hp1HQaKDQW4cQrK2D0P7mmbFtsV1N89am55Yru/nyEwRubcw==";
       };
     };
+    "verda-1.0.0-4" = {
+      name = "verda";
+      packageName = "verda";
+      version = "1.0.0-4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/verda/-/verda-1.0.0-4.tgz";
+        sha512 = "DKr2WdWlPwJvmqCcjs6LPaBOacFQUdk6+u7tqwkxYKbHa0Touff7Y6x+YAWbnT1dace5Qlv/CRr6YBEaB08r3A==";
+      };
+    };
     "verror-1.1.0" = {
       name = "verror";
       packageName = "verror";
@@ -42758,6 +43343,15 @@ let
         sha512 = "IKIWTdUPBnOtwznIrhxKnjVZ7hYxEzwZ3M2xmDi7OjjexuOM6LnGtoo1Dv4wYSik4epK4STEib6e8da2GxUsJA==";
       };
     };
+    "vscode-languageserver-types-3.6.0" = {
+      name = "vscode-languageserver-types";
+      packageName = "vscode-languageserver-types";
+      version = "3.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.6.0.tgz";
+        sha512 = "GSgQtGmtza4PoNH0+iHWylWg/1sw2DODezqYWRxbN910dPchI3CQaSJN76csKcQGv55wsWgX82T6n74q8mFSpw==";
+      };
+    };
     "vscode-nls-3.2.5" = {
       name = "vscode-nls";
       packageName = "vscode-nls";
@@ -43019,13 +43613,13 @@ let
         sha512 = "5nIvteTDCUws2DVvP9Qe+JPla7kWPPIDFZv55To7IycHWZ+Z5qBdaBYPyuXWdhggTufZkQwfIK+5rKQTVovm2A==";
       };
     };
-    "webpack-cli-3.3.8" = {
+    "webpack-cli-3.3.9" = {
       name = "webpack-cli";
       packageName = "webpack-cli";
-      version = "3.3.8";
+      version = "3.3.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.8.tgz";
-        sha512 = "RANYSXwikSWINjHMd/mtesblNSpjpDLoYTBtP99n1RhXqVI/wxN40Auqy42I7y4xrbmRBoA5Zy5E0JSBD5XRhw==";
+        url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.9.tgz";
+        sha512 = "xwnSxWl8nZtBl/AFJCOn9pG7s5CYUYdZxmmukv+fAHLcBIHM36dImfpQg3WfShZXeArkWlf6QRw24Klcsv8a5A==";
       };
     };
     "webpack-core-0.6.9" = {
@@ -44592,17 +45186,17 @@ in
   "@angular/cli" = nodeEnv.buildNodePackage {
     name = "_at_angular_slash_cli";
     packageName = "@angular/cli";
-    version = "8.3.4";
+    version = "8.3.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@angular/cli/-/cli-8.3.4.tgz";
-      sha512 = "5Jp7a1/Yepm2JkrMHY2Q7nO1FxlNvGp1Zc3m9dp4ydH08qO6/Z8WO0HF+/BxAsHZzB+XV91E1ZzbLR0RdsM8ag==";
+      url = "https://registry.npmjs.org/@angular/cli/-/cli-8.3.5.tgz";
+      sha512 = "gKzYV5YhypXKpt4vH/YJ/T7a72EqxTJynJ8dtoVsZw5YTdCzqa6APvObNs4lZaZ3pYxUOQr36W4Rz8Lv8CSBWA==";
     };
     dependencies = [
-      sources."@angular-devkit/architect-0.803.4"
-      sources."@angular-devkit/core-8.3.4"
-      sources."@angular-devkit/schematics-8.3.4"
-      sources."@schematics/angular-8.3.4"
-      sources."@schematics/update-0.803.4"
+      sources."@angular-devkit/architect-0.803.5"
+      sources."@angular-devkit/core-8.3.5"
+      sources."@angular-devkit/schematics-8.3.5"
+      sources."@schematics/angular-8.3.5"
+      sources."@schematics/update-0.803.5"
       sources."@yarnpkg/lockfile-1.1.0"
       sources."JSONStream-1.3.5"
       sources."agent-base-4.3.0"
@@ -44734,7 +45328,7 @@ in
       sources."mimic-fn-2.1.0"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      sources."minipass-2.6.2"
+      sources."minipass-2.8.1"
       sources."minizlib-1.2.2"
       sources."mississippi-3.0.0"
       sources."mkdirp-0.5.1"
@@ -44846,7 +45440,7 @@ in
       sources."strip-ansi-5.2.0"
       sources."supports-color-5.5.0"
       sources."symbol-observable-1.2.0"
-      sources."tar-4.4.10"
+      sources."tar-4.4.11"
       sources."through-2.3.8"
       sources."through2-2.0.5"
       sources."tmp-0.0.33"
@@ -44980,7 +45574,11 @@ in
       sources."clean-git-ref-1.0.3"
       sources."clone-2.1.2"
       sources."clone-buffer-1.0.0"
-      sources."clone-response-1.0.2"
+      (sources."clone-response-1.0.2" // {
+        dependencies = [
+          sources."mimic-response-1.0.1"
+        ];
+      })
       sources."clone-stats-1.0.0"
       (sources."cloneable-readable-1.1.3" // {
         dependencies = [
@@ -45000,7 +45598,7 @@ in
       sources."core-util-is-1.0.2"
       sources."crc-32-1.2.0"
       sources."decamelize-1.2.0"
-      sources."decompress-response-3.3.0"
+      sources."decompress-response-4.2.1"
       sources."deep-freeze-node-1.1.3"
       sources."defer-to-connect-1.0.2"
       sources."define-properties-1.1.3"
@@ -45059,7 +45657,12 @@ in
       })
       sources."globalyzer-0.1.4"
       sources."globrex-0.1.2"
-      sources."got-9.6.0"
+      (sources."got-9.6.0" // {
+        dependencies = [
+          sources."decompress-response-3.3.0"
+          sources."mimic-response-1.0.1"
+        ];
+      })
       sources."graceful-fs-4.2.2"
       (sources."gulp-vinyl-zip-2.1.2" // {
         dependencies = [
@@ -45069,7 +45672,7 @@ in
           sources."through2-2.0.5"
         ];
       })
-      sources."handlebars-4.2.0"
+      sources."handlebars-4.2.1"
       sources."has-symbols-1.0.0"
       sources."http-cache-semantics-4.0.3"
       sources."ignore-5.1.4"
@@ -45110,7 +45713,7 @@ in
       sources."matcher-2.0.0"
       sources."mime-db-1.40.0"
       sources."mime-types-2.1.24"
-      sources."mimic-response-1.0.1"
+      sources."mimic-response-2.0.0"
       sources."minimatch-3.0.4"
       sources."minimatch-all-1.1.0"
       sources."minimist-1.2.0"
@@ -45120,7 +45723,7 @@ in
       sources."neo-async-2.6.1"
       sources."nick-0.1.3"
       sources."normalize-path-2.1.1"
-      sources."normalize-url-4.3.0"
+      sources."normalize-url-4.4.1"
       sources."now-and-later-2.0.1"
       sources."object-keys-1.1.1"
       sources."object.assign-4.1.0"
@@ -45179,7 +45782,7 @@ in
       sources."safe-buffer-5.2.0"
       sources."sha.js-2.4.11"
       sources."simple-concat-1.0.0"
-      sources."simple-get-3.0.3"
+      sources."simple-get-3.1.0"
       sources."source-map-0.6.1"
       sources."split-0.3.3"
       sources."split2-3.1.1"
@@ -45347,11 +45950,11 @@ in
       sources."@babel/template-7.6.0"
       sources."@babel/traverse-7.6.0"
       sources."@babel/types-7.6.1"
-      sources."@hapi/address-2.1.1"
+      sources."@hapi/address-2.1.2"
       sources."@hapi/bourne-1.3.2"
       sources."@hapi/hoek-8.2.4"
       sources."@hapi/joi-15.1.1"
-      sources."@hapi/topo-3.1.3"
+      sources."@hapi/topo-3.1.4"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
       sources."@nodelib/fs.stat-1.1.3"
       sources."@protobufjs/aspromise-1.1.2"
@@ -45531,7 +46134,7 @@ in
       sources."collection-visit-1.0.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
-      sources."colors-1.3.3"
+      sources."colors-1.4.0"
       sources."combined-stream-1.0.8"
       sources."commander-2.20.0"
       sources."commondir-1.0.1"
@@ -45618,7 +46221,7 @@ in
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
       sources."ejs-2.7.1"
-      sources."electron-to-chromium-1.3.260"
+      sources."electron-to-chromium-1.3.264"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.1"
       sources."entities-1.1.2"
@@ -45699,7 +46302,7 @@ in
       })
       sources."find-up-3.0.0"
       sources."fkill-6.2.0"
-      sources."flow-parser-0.107.0"
+      sources."flow-parser-0.108.0"
       sources."for-in-1.0.2"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
@@ -45741,7 +46344,7 @@ in
       sources."got-6.7.1"
       sources."graceful-fs-4.2.2"
       sources."graceful-readlink-1.0.1"
-      sources."graphql-14.5.6"
+      sources."graphql-14.5.7"
       (sources."graphql-anywhere-4.2.4" // {
         dependencies = [
           sources."ts-invariant-0.3.3"
@@ -46583,7 +47186,7 @@ in
       sources."chmodr-1.2.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
-      sources."colors-1.3.3"
+      sources."colors-1.4.0"
       sources."commander-2.20.0"
       sources."concat-map-0.0.1"
       sources."convert-source-map-1.6.0"
@@ -47142,7 +47745,7 @@ in
       sources."agent-base-4.3.0"
       sources."ansi-styles-3.2.1"
       sources."balanced-match-1.0.0"
-      sources."big-integer-1.6.44"
+      sources."big-integer-1.6.45"
       sources."binary-0.3.0"
       sources."bluebird-3.4.7"
       sources."brace-expansion-1.1.11"
@@ -47253,7 +47856,7 @@ in
           sources."whatwg-url-7.0.0"
         ];
       })
-      sources."decompress-response-3.3.0"
+      sources."decompress-response-4.2.1"
       sources."deep-extend-0.6.0"
       sources."deep-is-0.1.3"
       sources."delayed-stream-1.0.0"
@@ -47305,7 +47908,7 @@ in
       sources."lodash.sortby-4.7.0"
       sources."mime-db-1.40.0"
       sources."mime-types-2.1.24"
-      sources."mimic-response-1.0.1"
+      sources."mimic-response-2.0.0"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
       (sources."mkdirp-0.5.1" // {
@@ -47351,7 +47954,7 @@ in
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.2"
       sources."simple-concat-1.0.0"
-      sources."simple-get-3.0.3"
+      sources."simple-get-3.1.0"
       sources."source-map-0.6.1"
       sources."sshpk-1.16.1"
       sources."stealthy-require-1.1.1"
@@ -47672,7 +48275,7 @@ in
       sources."os-browserify-0.3.0"
       sources."pako-1.0.10"
       sources."parents-1.0.1"
-      sources."parse-asn1-5.1.4"
+      sources."parse-asn1-5.1.5"
       sources."path-browserify-0.0.1"
       sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.6"
@@ -48246,7 +48849,7 @@ in
       sources."code-point-at-1.1.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
-      sources."colors-1.3.3"
+      sources."colors-1.4.0"
       sources."commander-2.20.0"
       sources."debug-3.2.6"
       sources."escape-string-regexp-1.0.5"
@@ -48293,7 +48896,7 @@ in
       sources."color-name-1.1.3"
       sources."color-string-1.5.3"
       sources."colornames-1.1.1"
-      sources."colors-1.3.3"
+      sources."colors-1.4.0"
       sources."colorspace-1.1.2"
       sources."commander-2.19.0"
       sources."core-util-is-1.0.2"
@@ -48395,7 +48998,7 @@ in
       })
       sources."base64-js-1.3.1"
       sources."bcrypt-pbkdf-1.0.2"
-      sources."big-integer-1.6.44"
+      sources."big-integer-1.6.45"
       (sources."body-parser-1.19.0" // {
         dependencies = [
           sources."bytes-3.1.0"
@@ -49407,7 +50010,7 @@ in
       sources."performance-now-2.1.0"
       sources."process-nextick-args-2.0.1"
       sources."pseudomap-1.0.2"
-      sources."qs-6.8.0"
+      sources."qs-6.9.0"
       sources."quicktask-1.1.0"
       sources."raf-3.3.2"
       sources."readable-stream-2.3.6"
@@ -49437,7 +50040,7 @@ in
       sources."symbol-observable-1.2.0"
       sources."through-2.3.8"
       sources."tmp-0.0.33"
-      sources."type-1.0.3"
+      sources."type-1.2.0"
       sources."util-deprecate-1.0.2"
       (sources."variable-diff-1.1.0" // {
         dependencies = [
@@ -49461,10 +50064,10 @@ in
   create-react-app = nodeEnv.buildNodePackage {
     name = "create-react-app";
     packageName = "create-react-app";
-    version = "3.1.1";
+    version = "3.1.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/create-react-app/-/create-react-app-3.1.1.tgz";
-      sha512 = "EaK59gIwEsSZjjIN4MyG0DkXcatF3cEXYODIH7rDrlUremb7iwi5RzZGGISmPIrfywLC82Qom/8CXiT8hwixPQ==";
+      url = "https://registry.npmjs.org/create-react-app/-/create-react-app-3.1.2.tgz";
+      sha512 = "y5wgEQwt6IpUP1N64uorVavhp8NPUAamVqA/paZmpvPSrW3l2c5UhXRi5m61plBBzDde2WyDr+3vCwDsfaS03w==";
     };
     dependencies = [
       sources."ansi-escapes-3.2.0"
@@ -49761,7 +50364,7 @@ in
       sources."collection-visit-1.0.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
-      sources."colors-1.3.3"
+      sources."colors-1.4.0"
       sources."combined-stream-1.0.8"
       sources."component-emitter-1.3.0"
       sources."concat-map-0.0.1"
@@ -49796,7 +50399,7 @@ in
       sources."dat-swarm-defaults-1.0.2"
       sources."debug-4.1.1"
       sources."decode-uri-component-0.2.0"
-      sources."decompress-response-3.3.0"
+      sources."decompress-response-4.2.1"
       sources."deep-equal-0.2.2"
       sources."deep-extend-0.6.0"
       sources."define-properties-1.1.3"
@@ -50006,7 +50609,7 @@ in
       sources."mime-2.4.4"
       sources."mime-db-1.40.0"
       sources."mime-types-2.1.24"
-      sources."mimic-response-1.0.1"
+      sources."mimic-response-2.0.0"
       sources."min-document-2.19.0"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
@@ -50139,7 +50742,7 @@ in
         ];
       })
       sources."simple-concat-1.0.0"
-      sources."simple-get-3.0.3"
+      sources."simple-get-3.1.0"
       sources."simple-sha1-2.1.2"
       sources."siphash24-1.1.1"
       sources."slice-ansi-1.0.0"
@@ -50234,7 +50837,7 @@ in
       sources."throttle-1.0.3"
       sources."thunky-1.0.3"
       sources."timed-out-4.0.1"
-      sources."timeout-refresh-1.0.0"
+      sources."timeout-refresh-1.0.1"
       sources."to-buffer-1.1.1"
       (sources."to-object-path-0.3.0" // {
         dependencies = [
@@ -50491,13 +51094,54 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
+  dockerfile-language-server-nodejs = nodeEnv.buildNodePackage {
+    name = "dockerfile-language-server-nodejs";
+    packageName = "dockerfile-language-server-nodejs";
+    version = "0.0.21";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.0.21.tgz";
+      sha512 = "lZ7VFAlS4vTm5MvxmwpREcYMARB3RQaGX0OZdcY8oSytsu4i5mMGVa6mi9/pZ9soqcUC08uxEA8EcqIeL3lyAA==";
+    };
+    dependencies = [
+      sources."dockerfile-ast-0.0.16"
+      (sources."dockerfile-language-service-0.0.8" // {
+        dependencies = [
+          (sources."dockerfile-utils-0.0.13" // {
+            dependencies = [
+              sources."vscode-languageserver-types-3.6.0"
+            ];
+          })
+        ];
+      })
+      (sources."dockerfile-utils-0.0.11" // {
+        dependencies = [
+          sources."dockerfile-ast-0.0.12"
+          sources."vscode-languageserver-types-3.6.0"
+        ];
+      })
+      sources."vscode-jsonrpc-4.0.0"
+      sources."vscode-languageserver-5.2.1"
+      sources."vscode-languageserver-protocol-3.14.1"
+      sources."vscode-languageserver-types-3.14.0"
+      sources."vscode-uri-1.0.8"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "A language server for Dockerfiles powered by NodeJS, TypeScript, and VSCode technologies.";
+      homepage = "https://github.com/rcjsuen/dockerfile-language-server-nodejs#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
   elasticdump = nodeEnv.buildNodePackage {
     name = "elasticdump";
     packageName = "elasticdump";
-    version = "6.9.1";
+    version = "6.10.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.9.1.tgz";
-      sha512 = "5nnktnPlrlJIMDlkgWrS64LUdT7VpPo5WgC1o2CMYSV7Bb0lxga6HotsEAMsiddwVT2wJg7tmAZQd6/Lz+N5Hg==";
+      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.10.6.tgz";
+      sha512 = "Zjrmui3KS2Fem8OyVNoN1pWOCvULJP88rl1RdnBA/lkBx7u15G0B7FIlzOwX7sjBuJcqb9G5K9FuJXPU3MEqZg==";
     };
     dependencies = [
       sources."JSONStream-1.3.5"
@@ -50506,7 +51150,7 @@ in
       sources."assert-plus-1.0.0"
       sources."async-2.6.3"
       sources."asynckit-0.4.0"
-      sources."aws-sdk-2.529.0"
+      sources."aws-sdk-2.533.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.8.0"
       sources."base64-js-1.3.1"
@@ -50534,7 +51178,7 @@ in
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
       sources."http-signature-1.2.0"
-      sources."ieee754-1.1.8"
+      sources."ieee754-1.1.13"
       sources."inherits-2.0.4"
       sources."ini-1.3.5"
       (sources."ip-address-6.1.0" // {
@@ -50561,7 +51205,7 @@ in
       sources."optimist-0.6.1"
       sources."p-finally-1.0.0"
       sources."p-queue-6.1.1"
-      sources."p-timeout-3.1.0"
+      sources."p-timeout-3.2.0"
       sources."performance-now-2.1.0"
       sources."process-nextick-args-2.0.1"
       sources."psl-1.4.0"
@@ -50678,7 +51322,7 @@ in
       sources."fresh-0.5.2"
       sources."fsevents-2.0.7"
       sources."get-stream-4.1.0"
-      sources."glob-parent-5.0.0"
+      sources."glob-parent-5.1.0"
       sources."has-ansi-2.0.0"
       sources."http-errors-1.7.3"
       sources."http-proxy-1.17.0"
@@ -51085,7 +51729,7 @@ in
       sources."fs.realpath-1.0.0"
       sources."functional-red-black-tree-1.0.1"
       sources."glob-7.1.4"
-      sources."glob-parent-5.0.0"
+      sources."glob-parent-5.1.0"
       sources."globals-11.12.0"
       sources."has-flag-3.0.0"
       sources."iconv-lite-0.4.24"
@@ -51237,7 +51881,7 @@ in
       sources."fs.realpath-1.0.0"
       sources."functional-red-black-tree-1.0.1"
       sources."glob-7.1.4"
-      sources."glob-parent-5.0.0"
+      sources."glob-parent-5.1.0"
       sources."globals-11.12.0"
       sources."has-flag-3.0.0"
       sources."iconv-lite-0.4.24"
@@ -51962,7 +52606,7 @@ in
       sources."preserve-0.2.0"
       (sources."prettyjson-1.2.1" // {
         dependencies = [
-          sources."colors-1.3.3"
+          sources."colors-1.4.0"
           sources."minimist-1.2.0"
         ];
       })
@@ -52606,7 +53250,7 @@ in
           sources."ms-2.1.2"
         ];
       })
-      sources."graphql-14.5.6"
+      sources."graphql-14.5.7"
       (sources."graphql-cli-prepare-1.4.19" // {
         dependencies = [
           sources."chalk-2.3.1"
@@ -52756,7 +53400,7 @@ in
       sources."mimic-fn-1.2.0"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      (sources."minipass-2.6.2" // {
+      (sources."minipass-2.8.1" // {
         dependencies = [
           sources."yallist-3.0.3"
         ];
@@ -52924,7 +53568,7 @@ in
       sources."supports-color-5.5.0"
       sources."swap-case-1.1.2"
       sources."sync-exec-0.6.2"
-      (sources."tar-4.4.10" // {
+      (sources."tar-4.4.11" // {
         dependencies = [
           sources."yallist-3.0.3"
         ];
@@ -53298,7 +53942,7 @@ in
       sources."ansi-term-0.0.2"
       sources."ansicolors-0.2.1"
       sources."blessed-0.1.81"
-      sources."blessed-contrib-4.8.16"
+      sources."blessed-contrib-4.8.17"
       sources."bresenham-0.0.3"
       sources."buffers-0.1.1"
       sources."cardinal-1.0.0"
@@ -53335,7 +53979,7 @@ in
       sources."lodash.assign-4.2.0"
       sources."lodash.toarray-4.4.0"
       sources."map-canvas-0.1.5"
-      sources."marked-0.6.3"
+      sources."marked-0.7.0"
       sources."marked-terminal-1.7.0"
       sources."memory-streams-0.1.3"
       sources."memorystream-0.3.1"
@@ -53781,7 +54425,7 @@ in
       sources."to-regex-3.0.2"
       sources."to-regex-range-2.1.1"
       sources."to-through-2.0.0"
-      sources."type-1.0.3"
+      sources."type-1.2.0"
       sources."typedarray-0.0.6"
       sources."unc-path-regex-0.1.2"
       sources."undertaker-1.2.1"
@@ -54131,7 +54775,7 @@ in
       })
       sources."to-regex-3.0.2"
       sources."to-regex-range-2.1.1"
-      sources."type-1.0.3"
+      sources."type-1.2.0"
       sources."typedarray-0.0.6"
       sources."unc-path-regex-0.1.2"
       sources."union-value-1.0.1"
@@ -54334,10 +54978,10 @@ in
       sources."corser-2.0.1"
       sources."debug-3.2.6"
       sources."ecstatic-3.3.2"
-      sources."eventemitter3-3.1.2"
+      sources."eventemitter3-4.0.0"
       sources."follow-redirects-1.9.0"
       sources."he-1.2.0"
-      sources."http-proxy-1.17.0"
+      sources."http-proxy-1.18.0"
       sources."mime-1.6.0"
       sources."minimist-1.2.0"
       (sources."mkdirp-0.5.1" // {
@@ -54525,26 +55169,26 @@ in
   ionic = nodeEnv.buildNodePackage {
     name = "ionic";
     packageName = "ionic";
-    version = "5.2.8";
+    version = "5.4.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ionic/-/ionic-5.2.8.tgz";
-      sha512 = "BeUquVJKI5CEqfyt1YlibDyvf/CyiXwg2957/vm6xkxp4At8D9tKJ3Ldb5e74SEgon5u1+mbcGNjDYB/OtTHgQ==";
+      url = "https://registry.npmjs.org/ionic/-/ionic-5.4.1.tgz";
+      sha512 = "z4Zdb1lEZoqx6HsURVgdqGw0INtDeNrbahTZacrqm3cNmjq6X4SOP+dILIeZoURq/V0KcyVcVQnssWRFbVd8TQ==";
     };
     dependencies = [
-      sources."@ionic/cli-framework-2.1.6"
-      sources."@ionic/discover-2.0.5"
-      sources."@ionic/utils-array-1.2.0"
-      sources."@ionic/utils-fs-2.0.6"
-      sources."@ionic/utils-network-1.0.4"
-      sources."@ionic/utils-object-1.0.4"
-      sources."@ionic/utils-process-1.0.4"
-      sources."@ionic/utils-stream-2.0.3"
-      sources."@ionic/utils-subprocess-1.0.7"
-      sources."@ionic/utils-terminal-1.0.4"
+      sources."@ionic/cli-framework-2.1.7"
+      sources."@ionic/discover-2.0.6"
+      sources."@ionic/utils-array-1.2.1"
+      sources."@ionic/utils-fs-2.0.7"
+      sources."@ionic/utils-network-1.0.5"
+      sources."@ionic/utils-object-1.0.5"
+      sources."@ionic/utils-process-1.0.5"
+      sources."@ionic/utils-stream-2.0.4"
+      sources."@ionic/utils-subprocess-1.0.8"
+      sources."@ionic/utils-terminal-1.0.5"
       sources."@types/node-8.10.54"
       sources."agent-base-4.3.0"
-      sources."ansi-escapes-3.2.0"
-      sources."ansi-regex-3.0.0"
+      sources."ansi-escapes-4.2.1"
+      sources."ansi-regex-4.1.0"
       sources."ansi-styles-3.2.1"
       sources."ast-types-0.13.2"
       sources."astral-regex-1.0.0"
@@ -54556,7 +55200,7 @@ in
       sources."chalk-2.4.2"
       sources."chardet-0.7.0"
       sources."chownr-1.1.2"
-      sources."cli-cursor-2.1.0"
+      sources."cli-cursor-3.1.0"
       sources."cli-width-2.2.0"
       sources."co-4.6.0"
       sources."color-convert-1.9.3"
@@ -54566,11 +55210,7 @@ in
       sources."concat-map-0.0.1"
       sources."cookiejar-2.1.2"
       sources."core-util-is-1.0.2"
-      (sources."cross-spawn-6.0.5" // {
-        dependencies = [
-          sources."semver-5.7.1"
-        ];
-      })
+      sources."cross-spawn-7.0.0"
       sources."data-uri-to-buffer-2.0.1"
       sources."debug-4.1.1"
       sources."deep-is-0.1.3"
@@ -54595,11 +55235,17 @@ in
       sources."esprima-3.1.3"
       sources."estraverse-4.3.0"
       sources."esutils-2.0.3"
-      sources."execa-1.0.0"
+      (sources."execa-1.0.0" // {
+        dependencies = [
+          sources."cross-spawn-6.0.5"
+          sources."path-key-2.0.1"
+          sources."semver-5.7.1"
+        ];
+      })
       sources."extend-3.0.2"
       sources."external-editor-3.1.0"
       sources."fast-levenshtein-2.0.6"
-      sources."figures-2.0.0"
+      sources."figures-3.0.0"
       sources."file-uri-to-path-1.0.0"
       sources."form-data-2.5.1"
       sources."formidable-1.2.1"
@@ -54634,15 +55280,7 @@ in
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      (sources."inquirer-6.5.2" // {
-        dependencies = [
-          (sources."string-width-2.1.1" // {
-            dependencies = [
-              sources."strip-ansi-4.0.0"
-            ];
-          })
-        ];
-      })
+      sources."inquirer-7.0.0"
       sources."ip-1.1.5"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-promise-2.1.0"
@@ -54673,6 +55311,11 @@ in
       sources."lodash.restparam-3.6.1"
       (sources."log-update-3.3.0" // {
         dependencies = [
+          sources."ansi-escapes-3.2.0"
+          sources."cli-cursor-2.1.0"
+          sources."mimic-fn-1.2.0"
+          sources."onetime-2.0.1"
+          sources."restore-cursor-2.0.0"
           sources."string-width-3.1.0"
           sources."wrap-ansi-5.1.0"
         ];
@@ -54683,10 +55326,10 @@ in
       sources."mime-2.4.4"
       sources."mime-db-1.40.0"
       sources."mime-types-2.1.24"
-      sources."mimic-fn-1.2.0"
+      sources."mimic-fn-2.1.0"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
-      (sources."minipass-2.6.2" // {
+      (sources."minipass-2.8.1" // {
         dependencies = [
           sources."yallist-3.0.3"
         ];
@@ -54698,12 +55341,16 @@ in
         ];
       })
       sources."ms-2.1.2"
-      sources."mute-stream-0.0.7"
+      sources."mute-stream-0.0.8"
       sources."netmask-1.0.6"
       sources."nice-try-1.0.5"
-      sources."npm-run-path-2.0.2"
+      (sources."npm-run-path-2.0.2" // {
+        dependencies = [
+          sources."path-key-2.0.1"
+        ];
+      })
       sources."once-1.4.0"
-      sources."onetime-2.0.1"
+      sources."onetime-5.1.0"
       sources."open-6.4.0"
       sources."optionator-0.8.2"
       sources."os-name-3.1.0"
@@ -54716,7 +55363,7 @@ in
       })
       sources."pac-resolver-3.0.0"
       sources."path-is-absolute-1.0.1"
-      sources."path-key-2.0.1"
+      sources."path-key-3.1.0"
       sources."prelude-ls-1.1.2"
       sources."process-nextick-args-2.0.1"
       (sources."proxy-agent-3.1.0" // {
@@ -54727,10 +55374,10 @@ in
       sources."proxy-from-env-1.0.0"
       sources."pseudomap-1.0.2"
       sources."pump-3.0.0"
-      sources."qs-6.8.0"
+      sources."qs-6.9.0"
       sources."raw-body-2.4.1"
       sources."readable-stream-3.4.0"
-      sources."restore-cursor-2.0.0"
+      sources."restore-cursor-3.1.0"
       sources."rimraf-3.0.0"
       sources."rsvp-3.6.2"
       sources."run-async-2.3.0"
@@ -54769,11 +55416,7 @@ in
         ];
       })
       sources."string_decoder-1.3.0"
-      (sources."strip-ansi-5.2.0" // {
-        dependencies = [
-          sources."ansi-regex-4.1.0"
-        ];
-      })
+      sources."strip-ansi-5.2.0"
       sources."strip-eof-1.0.0"
       sources."superagent-4.1.0"
       (sources."superagent-proxy-2.0.0" // {
@@ -54782,7 +55425,7 @@ in
         ];
       })
       sources."supports-color-5.5.0"
-      (sources."tar-4.4.10" // {
+      (sources."tar-4.4.11" // {
         dependencies = [
           sources."yallist-3.0.3"
         ];
@@ -54795,6 +55438,7 @@ in
       sources."tree-kill-1.2.1"
       sources."tslib-1.10.0"
       sources."type-check-0.3.2"
+      sources."type-fest-0.5.2"
       sources."typedarray-to-buffer-3.1.5"
       sources."universalify-0.1.2"
       sources."unpipe-1.0.0"
@@ -54845,6 +55489,386 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
+  "iosevka-build-deps-../../data/fonts/iosevka" = nodeEnv.buildNodePackage {
+    name = "iosevka-build-deps";
+    packageName = "iosevka-build-deps";
+    version = "2.3.0";
+    src = ../../data/fonts/iosevka;
+    dependencies = [
+      sources."JSONStream-1.3.5"
+      sources."abbrev-1.1.1"
+      sources."ajv-6.10.2"
+      sources."amdefine-1.0.1"
+      sources."ansi-regex-2.1.1"
+      sources."ansi-styles-3.2.1"
+      sources."aproba-1.2.0"
+      sources."are-we-there-yet-1.1.5"
+      sources."argparse-1.0.10"
+      sources."asn1-0.2.4"
+      sources."assert-plus-1.0.0"
+      sources."asynckit-0.4.0"
+      sources."atob-2.1.2"
+      sources."aws-sign2-0.7.0"
+      sources."aws4-1.8.0"
+      sources."balanced-match-1.0.0"
+      sources."bcrypt-pbkdf-1.0.2"
+      sources."bezier-js-2.4.3"
+      sources."bindings-1.5.0"
+      sources."block-stream-0.0.9"
+      sources."bluebird-3.5.5"
+      sources."brace-expansion-1.1.11"
+      sources."bufferstreams-1.1.3"
+      sources."camelcase-4.1.0"
+      sources."caryll-shapeops-0.3.1"
+      sources."caseless-0.12.0"
+      sources."chalk-2.4.2"
+      sources."child-process-promise-2.2.1"
+      sources."cli-cursor-2.1.0"
+      sources."clipper-lib-1.0.0"
+      (sources."cliui-3.2.0" // {
+        dependencies = [
+          sources."string-width-1.0.2"
+        ];
+      })
+      sources."clone-2.1.2"
+      sources."code-point-at-1.1.0"
+      sources."color-convert-1.9.3"
+      sources."color-name-1.1.3"
+      sources."colors-1.4.0"
+      sources."combined-stream-1.0.8"
+      sources."complex.js-2.0.11"
+      sources."concat-map-0.0.1"
+      sources."console-control-strings-1.1.0"
+      sources."core-util-is-1.0.2"
+      sources."cross-spawn-4.0.2"
+      sources."css-2.2.4"
+      sources."css-parse-2.0.0"
+      sources."cubic2quad-1.1.1"
+      sources."dashdash-1.14.1"
+      sources."debug-3.1.0"
+      sources."decamelize-1.2.0"
+      sources."decimal.js-10.2.0"
+      sources."decode-uri-component-0.2.0"
+      sources."deep-is-0.1.3"
+      sources."delayed-stream-1.0.0"
+      sources."delegates-1.0.0"
+      sources."ecc-jsbn-0.1.2"
+      sources."end-of-stream-1.4.1"
+      sources."error-ex-1.3.2"
+      sources."escape-latex-1.2.0"
+      sources."escape-string-regexp-1.0.5"
+      sources."escodegen-1.12.0"
+      (sources."escope-1.0.3" // {
+        dependencies = [
+          sources."estraverse-2.0.0"
+        ];
+      })
+      (sources."esmangle-1.0.1" // {
+        dependencies = [
+          sources."escodegen-1.3.3"
+          sources."esprima-1.1.1"
+          sources."estraverse-1.5.1"
+          sources."esutils-1.0.0"
+          sources."fast-levenshtein-1.0.7"
+          sources."levn-0.2.5"
+          sources."optionator-0.3.0"
+          sources."source-map-0.1.43"
+          sources."wordwrap-0.0.3"
+        ];
+      })
+      sources."esprima-3.1.3"
+      (sources."esshorten-1.1.1" // {
+        dependencies = [
+          sources."estraverse-4.1.1"
+        ];
+      })
+      sources."estraverse-4.3.0"
+      sources."esutils-2.0.3"
+      (sources."execa-0.7.0" // {
+        dependencies = [
+          sources."cross-spawn-5.1.0"
+        ];
+      })
+      sources."extend-3.0.2"
+      sources."extsprintf-1.3.0"
+      sources."fast-deep-equal-2.0.1"
+      sources."fast-json-stable-stringify-2.0.0"
+      sources."fast-levenshtein-2.0.6"
+      sources."file-uri-to-path-1.0.0"
+      sources."find-up-2.1.0"
+      sources."first-chunk-stream-2.0.0"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.3.3"
+      sources."fraction.js-4.0.12"
+      sources."fs-extra-3.0.1"
+      sources."fs.realpath-1.0.0"
+      sources."fstream-1.0.12"
+      (sources."gauge-2.7.4" // {
+        dependencies = [
+          sources."string-width-1.0.2"
+        ];
+      })
+      sources."get-caller-file-1.0.3"
+      sources."get-stream-3.0.0"
+      sources."getpass-0.1.7"
+      sources."glob-7.1.4"
+      sources."graceful-fs-4.2.2"
+      sources."har-schema-2.0.0"
+      sources."har-validator-5.1.3"
+      sources."has-flag-3.0.0"
+      sources."has-unicode-2.0.1"
+      sources."hosted-git-info-2.8.4"
+      sources."http-signature-1.2.0"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.4"
+      sources."invert-kv-1.0.0"
+      sources."is-arrayish-0.2.1"
+      sources."is-fullwidth-code-point-1.0.0"
+      sources."is-stream-1.1.0"
+      sources."is-typedarray-1.0.0"
+      sources."is-utf8-0.2.1"
+      sources."isarray-1.0.0"
+      sources."isexe-2.0.0"
+      sources."isstream-0.1.2"
+      sources."javascript-natural-sort-0.7.1"
+      sources."jsbn-0.1.1"
+      sources."json-schema-0.2.3"
+      sources."json-schema-traverse-0.4.1"
+      sources."json-stringify-safe-5.0.1"
+      sources."jsonfile-3.0.1"
+      sources."jsonparse-1.3.1"
+      sources."jsprim-1.4.1"
+      sources."lcid-1.0.0"
+      sources."levn-0.3.0"
+      sources."libspiro-js-0.3.1"
+      sources."load-json-file-2.0.0"
+      sources."locate-path-2.0.0"
+      sources."lru-cache-4.1.5"
+      sources."map-age-cleaner-0.1.3"
+      sources."mathjs-5.10.3"
+      sources."megaminx-0.9.0"
+      sources."mem-1.1.0"
+      sources."microbuffer-1.0.0"
+      sources."mime-db-1.40.0"
+      sources."mime-types-2.1.24"
+      sources."mimic-fn-1.2.0"
+      sources."minimatch-3.0.4"
+      sources."minimist-0.0.8"
+      sources."mkdirp-0.5.1"
+      sources."ms-2.0.0"
+      sources."nan-2.14.0"
+      sources."nice-try-1.0.5"
+      (sources."node-gyp-3.8.0" // {
+        dependencies = [
+          sources."semver-5.3.0"
+        ];
+      })
+      sources."node-version-1.2.0"
+      sources."nopt-3.0.6"
+      sources."normalize-package-data-2.5.0"
+      sources."npm-run-path-2.0.2"
+      sources."npmlog-4.1.2"
+      sources."number-is-nan-1.0.1"
+      sources."oauth-sign-0.9.0"
+      sources."object-assign-4.1.1"
+      sources."once-1.4.0"
+      sources."onetime-2.0.1"
+      sources."optionator-0.8.2"
+      sources."os-homedir-1.0.2"
+      sources."os-locale-2.1.0"
+      sources."os-tmpdir-1.0.2"
+      sources."osenv-0.1.5"
+      (sources."otfcc-ttcize-0.8.0" // {
+        dependencies = [
+          sources."fs-extra-4.0.3"
+          sources."jsonfile-4.0.0"
+          (sources."megaminx-0.3.3" // {
+            dependencies = [
+              sources."fs-extra-3.0.1"
+              sources."jsonfile-3.0.1"
+            ];
+          })
+          sources."yargs-8.0.2"
+        ];
+      })
+      sources."p-defer-1.0.0"
+      sources."p-finally-1.0.0"
+      sources."p-is-promise-2.1.0"
+      sources."p-limit-1.3.0"
+      sources."p-locate-2.0.0"
+      sources."p-try-1.0.0"
+      sources."pako-1.0.10"
+      sources."parse-json-2.2.0"
+      (sources."patel-0.33.1" // {
+        dependencies = [
+          sources."camelcase-3.0.0"
+          sources."find-up-1.1.2"
+          sources."load-json-file-1.1.0"
+          sources."os-locale-1.4.0"
+          sources."path-exists-2.1.0"
+          sources."path-type-1.1.0"
+          sources."read-pkg-1.1.0"
+          sources."read-pkg-up-1.0.1"
+          sources."string-width-1.0.2"
+          sources."strip-bom-2.0.0"
+          sources."which-module-1.0.0"
+          sources."yargs-6.6.0"
+          sources."yargs-parser-4.2.1"
+        ];
+      })
+      sources."path-exists-3.0.0"
+      sources."path-is-absolute-1.0.1"
+      sources."path-key-2.0.1"
+      sources."path-parse-1.0.6"
+      sources."path-type-2.0.0"
+      sources."patrisika-0.21.0"
+      sources."patrisika-scopes-0.11.1"
+      sources."performance-now-2.1.0"
+      sources."pify-2.3.0"
+      sources."pinkie-2.0.4"
+      sources."pinkie-promise-2.0.1"
+      sources."prelude-ls-1.1.2"
+      sources."primitive-quadify-off-curves-0.4.1"
+      sources."process-nextick-args-2.0.1"
+      sources."promise-polyfill-6.1.0"
+      sources."proper-lockfile-3.2.0"
+      sources."pseudomap-1.0.2"
+      sources."psl-1.4.0"
+      sources."pump-3.0.0"
+      sources."punycode-2.1.1"
+      sources."qs-6.5.2"
+      sources."read-pkg-2.0.0"
+      sources."read-pkg-up-2.0.0"
+      sources."readable-stream-2.3.6"
+      sources."request-2.88.0"
+      sources."require-directory-2.1.1"
+      sources."require-main-filename-1.0.1"
+      sources."resolve-1.12.0"
+      sources."resolve-url-0.2.1"
+      sources."restore-cursor-2.0.0"
+      sources."resumer-0.0.0"
+      sources."retry-0.12.0"
+      sources."rimraf-2.2.8"
+      sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
+      sources."sax-1.2.4"
+      sources."seed-random-2.2.0"
+      sources."semaphore-async-await-1.5.1"
+      sources."semver-5.7.1"
+      sources."set-blocking-2.0.0"
+      sources."shebang-command-1.2.0"
+      sources."shebang-regex-1.0.0"
+      sources."signal-exit-3.0.2"
+      sources."source-map-0.6.1"
+      sources."source-map-resolve-0.5.2"
+      sources."source-map-url-0.4.0"
+      sources."spdx-correct-3.1.0"
+      sources."spdx-exceptions-2.2.0"
+      sources."spdx-expression-parse-3.0.0"
+      sources."spdx-license-ids-3.0.5"
+      sources."split-1.0.1"
+      sources."sprintf-js-1.0.3"
+      sources."sshpk-1.16.1"
+      sources."stack-trace-0.0.9"
+      (sources."string-width-2.1.1" // {
+        dependencies = [
+          sources."ansi-regex-3.0.0"
+          sources."is-fullwidth-code-point-2.0.0"
+          sources."strip-ansi-4.0.0"
+        ];
+      })
+      sources."string_decoder-1.1.1"
+      sources."strip-ansi-3.0.1"
+      sources."strip-bom-3.0.0"
+      sources."strip-bom-buf-1.0.0"
+      sources."strip-bom-stream-3.0.0"
+      sources."strip-eof-1.0.0"
+      (sources."stylus-0.54.7" // {
+        dependencies = [
+          sources."semver-6.3.0"
+          sources."source-map-0.7.3"
+        ];
+      })
+      sources."supports-color-5.5.0"
+      sources."tar-2.2.2"
+      sources."temp-0.8.3"
+      sources."through-2.3.8"
+      sources."tiny-emitter-2.1.0"
+      sources."toml-2.3.6"
+      sources."topsort-0.0.2"
+      (sources."tough-cookie-2.4.3" // {
+        dependencies = [
+          sources."punycode-1.4.1"
+        ];
+      })
+      sources."ts-process-promises-1.0.2"
+      sources."tslib-1.9.3"
+      sources."ttf2woff-2.0.1"
+      sources."ttf2woff2-2.0.3"
+      sources."tunnel-agent-0.6.0"
+      sources."tweetnacl-0.14.5"
+      sources."type-check-0.3.2"
+      sources."typed-function-1.1.0"
+      sources."typo-geom-0.5.1"
+      sources."universalify-0.1.2"
+      sources."unorm-1.6.0"
+      sources."uri-js-4.2.2"
+      sources."urix-0.1.0"
+      sources."util-deprecate-1.0.2"
+      sources."uuid-3.3.3"
+      sources."validate-npm-package-license-3.0.4"
+      (sources."verda-1.0.0-4" // {
+        dependencies = [
+          sources."ansi-regex-4.1.0"
+          sources."fs-extra-6.0.1"
+          sources."jsonfile-4.0.0"
+          sources."strip-ansi-5.2.0"
+        ];
+      })
+      sources."verror-1.10.0"
+      sources."which-1.3.1"
+      sources."which-module-2.0.0"
+      sources."wide-align-1.1.3"
+      sources."wordwrap-1.0.0"
+      (sources."wrap-ansi-2.1.0" // {
+        dependencies = [
+          sources."string-width-1.0.2"
+        ];
+      })
+      sources."wrappy-1.0.2"
+      sources."y18n-3.2.1"
+      sources."yallist-2.1.2"
+      (sources."yargs-12.0.5" // {
+        dependencies = [
+          sources."ansi-regex-3.0.0"
+          sources."camelcase-5.3.1"
+          sources."cliui-4.1.0"
+          sources."cross-spawn-6.0.5"
+          sources."execa-1.0.0"
+          sources."find-up-3.0.0"
+          sources."get-stream-4.1.0"
+          sources."invert-kv-2.0.0"
+          sources."lcid-2.0.0"
+          sources."locate-path-3.0.0"
+          sources."mem-4.3.0"
+          sources."mimic-fn-2.1.0"
+          sources."os-locale-3.1.0"
+          sources."p-limit-2.2.1"
+          sources."p-locate-3.0.0"
+          sources."p-try-2.2.0"
+          sources."strip-ansi-4.0.0"
+          sources."yargs-parser-11.1.1"
+        ];
+      })
+      sources."yargs-parser-7.0.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
   jake = nodeEnv.buildNodePackage {
     name = "jake";
     packageName = "jake";
@@ -55056,7 +56080,7 @@ in
       })
       sources."debug-3.2.6"
       sources."decode-uri-component-0.2.0"
-      sources."decompress-response-3.3.0"
+      sources."decompress-response-4.2.1"
       sources."deep-extend-0.6.0"
       sources."deep-is-0.1.3"
       sources."deepmerge-2.2.1"
@@ -55229,10 +56253,10 @@ in
       sources."mime-2.4.4"
       sources."mime-db-1.40.0"
       sources."mime-types-2.1.24"
-      sources."mimic-response-1.0.1"
+      sources."mimic-response-2.0.0"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      sources."minipass-2.6.2"
+      sources."minipass-2.8.1"
       sources."minizlib-1.2.2"
       sources."mkdirp-0.5.1"
       sources."moment-2.24.0"
@@ -55348,7 +56372,7 @@ in
       sources."sharp-0.22.1"
       sources."signal-exit-3.0.2"
       sources."simple-concat-1.0.0"
-      sources."simple-get-3.0.3"
+      sources."simple-get-3.1.0"
       sources."simple-swizzle-0.2.2"
       (sources."slice-ansi-1.0.0" // {
         dependencies = [
@@ -55392,7 +56416,7 @@ in
       sources."symbol-tree-3.2.4"
       sources."syswide-cas-5.3.0"
       sources."table-layout-0.4.5"
-      sources."tar-4.4.10"
+      sources."tar-4.4.11"
       sources."tar-fs-2.0.0"
       (sources."tar-stream-2.1.0" // {
         dependencies = [
@@ -55721,7 +56745,7 @@ in
       sources."path-loader-1.0.10"
       sources."process-nextick-args-2.0.1"
       sources."punycode-2.1.1"
-      sources."qs-6.8.0"
+      sources."qs-6.9.0"
       sources."readable-stream-2.3.6"
       sources."safe-buffer-5.1.2"
       sources."slash-2.0.0"
@@ -55907,7 +56931,7 @@ in
       sources."ms-2.0.0"
       sources."nanoid-2.1.1"
       sources."negotiator-0.6.2"
-      sources."normalize-url-4.3.0"
+      sources."normalize-url-4.4.1"
       sources."npm-run-path-2.0.2"
       sources."oauth-sign-0.9.0"
       sources."object-assign-4.1.1"
@@ -56084,8 +57108,8 @@ in
       sources."buffer-fill-1.0.0"
       sources."bytes-3.1.0"
       sources."callsite-1.0.0"
-      sources."chokidar-3.1.0"
-      sources."colors-1.3.3"
+      sources."chokidar-3.1.1"
+      sources."colors-1.4.0"
       sources."component-bind-1.0.0"
       sources."component-emitter-1.2.1"
       sources."component-inherit-0.0.3"
@@ -56115,7 +57139,7 @@ in
       sources."engine.io-parser-2.1.3"
       sources."ent-2.2.0"
       sources."escape-html-1.0.3"
-      sources."eventemitter3-3.1.2"
+      sources."eventemitter3-4.0.0"
       sources."extend-3.0.2"
       sources."fill-range-7.0.1"
       sources."finalhandler-1.1.2"
@@ -56130,12 +57154,12 @@ in
       sources."fs.realpath-1.0.0"
       sources."fsevents-2.0.7"
       sources."glob-7.1.4"
-      sources."glob-parent-5.0.0"
+      sources."glob-parent-5.1.0"
       sources."graceful-fs-4.2.2"
       sources."has-binary2-1.0.3"
       sources."has-cors-1.1.0"
       sources."http-errors-1.7.2"
-      sources."http-proxy-1.17.0"
+      sources."http-proxy-1.18.0"
       sources."iconv-lite-0.4.24"
       sources."indexof-0.0.1"
       sources."inflight-1.0.6"
@@ -56372,7 +57396,7 @@ in
       sources."code-point-at-1.1.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
-      sources."colors-1.3.3"
+      sources."colors-1.4.0"
       sources."combined-stream-1.0.8"
       sources."concat-map-0.0.1"
       sources."core-util-is-1.0.2"
@@ -56709,7 +57733,7 @@ in
         ];
       })
       sources."@octokit/request-error-1.0.4"
-      sources."@octokit/rest-16.28.9"
+      sources."@octokit/rest-16.30.0"
       sources."@types/events-3.0.0"
       sources."@types/glob-7.1.1"
       sources."@types/minimatch-3.0.3"
@@ -57014,7 +58038,7 @@ in
       sources."git-url-parse-11.1.2"
       sources."gitconfiglocal-1.0.0"
       sources."glob-7.1.4"
-      sources."glob-parent-5.0.0"
+      sources."glob-parent-5.1.0"
       sources."glob-to-regexp-0.3.0"
       (sources."globby-9.2.0" // {
         dependencies = [
@@ -57022,7 +58046,7 @@ in
         ];
       })
       sources."graceful-fs-4.2.2"
-      (sources."handlebars-4.2.0" // {
+      (sources."handlebars-4.2.1" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
@@ -57163,7 +58187,7 @@ in
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
       sources."minimist-options-3.0.2"
-      sources."minipass-2.6.2"
+      sources."minipass-2.8.1"
       sources."minizlib-1.2.2"
       sources."mississippi-3.0.0"
       (sources."mixin-deep-1.3.2" // {
@@ -57197,7 +58221,7 @@ in
       })
       sources."normalize-url-3.3.0"
       sources."npm-bundled-1.0.6"
-      sources."npm-lifecycle-3.1.3"
+      sources."npm-lifecycle-3.1.4"
       (sources."npm-package-arg-6.1.1" // {
         dependencies = [
           sources."semver-5.7.1"
@@ -57448,7 +58472,7 @@ in
         ];
       })
       sources."supports-color-5.5.0"
-      sources."tar-4.4.10"
+      sources."tar-4.4.11"
       sources."temp-dir-1.0.0"
       sources."temp-write-3.4.0"
       sources."text-extensions-2.0.0"
@@ -57717,7 +58741,7 @@ in
         ];
       })
       sources."collection-visit-1.0.0"
-      sources."colors-1.3.3"
+      sources."colors-1.4.0"
       sources."component-emitter-1.3.0"
       sources."connect-3.7.0"
       sources."copy-descriptor-0.1.1"
@@ -58018,7 +59042,7 @@ in
         ];
       })
       sources."base64-arraybuffer-0.1.5"
-      sources."base64id-1.0.0"
+      sources."base64id-2.0.0"
       sources."bcrypt-pbkdf-1.0.2"
       sources."better-assert-1.0.2"
       sources."binary-extensions-1.13.1"
@@ -58078,19 +59102,22 @@ in
       sources."ee-first-1.1.1"
       sources."emoji-regex-6.1.1"
       sources."encodeurl-1.0.2"
-      (sources."engine.io-3.3.2" // {
+      (sources."engine.io-3.4.0" // {
         dependencies = [
           sources."cookie-0.3.1"
-          sources."debug-3.1.0"
+          sources."debug-4.1.1"
+          sources."ms-2.1.2"
         ];
       })
-      (sources."engine.io-client-3.3.2" // {
+      (sources."engine.io-client-3.4.0" // {
         dependencies = [
           sources."component-emitter-1.2.1"
-          sources."debug-3.1.0"
+          sources."debug-4.1.1"
+          sources."ms-2.1.2"
+          sources."ws-6.1.4"
         ];
       })
-      sources."engine.io-parser-2.1.3"
+      sources."engine.io-parser-2.2.0"
       sources."entities-1.1.2"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
@@ -58384,24 +59411,33 @@ in
         ];
       })
       sources."snapdragon-util-3.0.1"
-      (sources."socket.io-2.2.0" // {
+      (sources."socket.io-2.3.0" // {
         dependencies = [
           sources."debug-4.1.1"
           sources."ms-2.1.2"
         ];
       })
       sources."socket.io-adapter-1.1.1"
-      (sources."socket.io-client-2.2.0" // {
+      (sources."socket.io-client-2.3.0" // {
         dependencies = [
           sources."component-emitter-1.2.1"
-          sources."debug-3.1.0"
+          sources."debug-4.1.1"
+          sources."isarray-2.0.1"
+          sources."ms-2.1.2"
+          (sources."socket.io-parser-3.3.0" // {
+            dependencies = [
+              sources."debug-3.1.0"
+              sources."ms-2.0.0"
+            ];
+          })
         ];
       })
-      (sources."socket.io-parser-3.3.0" // {
+      (sources."socket.io-parser-3.4.0" // {
         dependencies = [
           sources."component-emitter-1.2.1"
-          sources."debug-3.1.0"
+          sources."debug-4.1.1"
           sources."isarray-2.0.1"
+          sources."ms-2.1.2"
         ];
       })
       sources."source-map-0.5.7"
@@ -58468,7 +59504,7 @@ in
       sources."uuid-3.3.3"
       sources."vary-1.1.2"
       sources."verror-1.10.0"
-      sources."ws-6.1.4"
+      sources."ws-7.1.2"
       sources."xmlhttprequest-ssl-1.5.5"
       sources."yeast-0.1.2"
     ];
@@ -58949,7 +59985,7 @@ in
       })
       sources."duplexer3-0.1.4"
       sources."duplexify-3.7.1"
-      sources."electron-to-chromium-1.3.260"
+      sources."electron-to-chromium-1.3.264"
       sources."elliptic-6.5.1"
       sources."emoji-regex-7.0.3"
       sources."emojis-list-2.1.0"
@@ -59140,7 +60176,7 @@ in
           })
           sources."get-stream-4.1.0"
           sources."http-cache-semantics-4.0.3"
-          sources."normalize-url-4.3.0"
+          sources."normalize-url-4.4.1"
           sources."p-cancelable-1.1.0"
         ];
       })
@@ -59386,7 +60422,7 @@ in
       sources."pako-1.0.10"
       sources."parallel-transform-1.2.0"
       sources."paredit.js-0.3.4"
-      sources."parse-asn1-5.1.4"
+      sources."parse-asn1-5.1.5"
       sources."parse-glob-3.0.4"
       sources."parse-json-2.2.0"
       sources."parse-passwd-1.0.0"
@@ -59777,7 +60813,7 @@ in
           sources."ms-2.0.0"
         ];
       })
-      (sources."webpack-cli-3.3.8" // {
+      (sources."webpack-cli-3.3.9" // {
         dependencies = [
           sources."supports-color-6.1.0"
         ];
@@ -60662,7 +61698,7 @@ in
       sources."tough-cookie-2.3.4"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."type-1.0.3"
+      sources."type-1.2.0"
       sources."typescript-3.5.3"
       (sources."uglify-js-3.4.9" // {
         dependencies = [
@@ -60918,7 +61954,7 @@ in
       sources."path-loader-1.0.10"
       sources."process-nextick-args-2.0.1"
       sources."punycode-2.1.1"
-      sources."qs-6.8.0"
+      sources."qs-6.9.0"
       sources."readable-stream-2.3.6"
       sources."safe-buffer-5.1.2"
       sources."slash-2.0.0"
@@ -61062,7 +62098,7 @@ in
       sources."mime-types-2.1.24"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      sources."minipass-2.6.2"
+      sources."minipass-2.8.1"
       sources."minizlib-1.2.2"
       sources."mkdirp-0.5.1"
       sources."nopt-3.0.6"
@@ -61089,7 +62125,7 @@ in
       sources."string-width-1.0.2"
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
-      sources."tar-4.4.10"
+      sources."tar-4.4.11"
       (sources."tough-cookie-2.4.3" // {
         dependencies = [
           sources."punycode-1.4.1"
@@ -61162,7 +62198,7 @@ in
       sources."base64-js-0.0.8"
       sources."bcrypt-pbkdf-1.0.2"
       sources."biased-opener-0.2.8"
-      sources."big-integer-1.6.44"
+      sources."big-integer-1.6.45"
       sources."block-stream-0.0.9"
       sources."body-parser-1.19.0"
       sources."boom-2.10.1"
@@ -61471,7 +62507,7 @@ in
       sources."isarray-1.0.0"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      sources."minipass-2.6.2"
+      sources."minipass-2.8.1"
       sources."minizlib-1.2.2"
       sources."mkdirp-0.5.1"
       sources."ms-2.1.2"
@@ -61505,7 +62541,7 @@ in
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-2.0.1"
-      sources."tar-4.4.10"
+      sources."tar-4.4.11"
       sources."util-deprecate-1.0.2"
       sources."wide-align-1.1.3"
       sources."wrappy-1.0.2"
@@ -61809,7 +62845,7 @@ in
       sources."mime-types-2.1.24"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
-      (sources."minipass-2.6.2" // {
+      (sources."minipass-2.8.1" // {
         dependencies = [
           sources."yallist-3.0.3"
         ];
@@ -61950,7 +62986,7 @@ in
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-2.0.1"
       sources."tail-2.0.3"
-      (sources."tar-4.4.10" // {
+      (sources."tar-4.4.11" // {
         dependencies = [
           sources."yallist-3.0.3"
         ];
@@ -61973,7 +63009,7 @@ in
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."twitter-ng-0.6.2"
-      sources."type-1.0.3"
+      sources."type-1.2.0"
       sources."type-is-1.6.18"
       sources."typedarray-0.0.6"
       sources."uc.micro-1.0.6"
@@ -62108,7 +63144,7 @@ in
       sources."mime-types-2.1.24"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      sources."minipass-2.6.2"
+      sources."minipass-2.8.1"
       sources."minizlib-1.2.2"
       sources."mkdirp-0.5.1"
       sources."ncp-0.4.2"
@@ -62181,7 +63217,7 @@ in
         ];
       })
       sources."strip-ansi-3.0.1"
-      sources."tar-4.4.10"
+      sources."tar-4.4.11"
       sources."temp-0.9.0"
       (sources."tough-cookie-2.4.3" // {
         dependencies = [
@@ -62740,7 +63776,7 @@ in
       sources."mimic-response-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      sources."minipass-2.6.2"
+      sources."minipass-2.8.1"
       sources."minizlib-1.2.2"
       sources."mississippi-3.0.0"
       sources."mkdirp-0.5.1"
@@ -62760,7 +63796,7 @@ in
           sources."semver-5.7.1"
         ];
       })
-      sources."normalize-url-4.3.0"
+      sources."normalize-url-4.4.1"
       sources."npm-bundled-1.0.6"
       (sources."npm-package-arg-6.1.1" // {
         dependencies = [
@@ -62886,7 +63922,7 @@ in
       sources."strip-eof-1.0.0"
       sources."strip-json-comments-2.0.1"
       sources."supports-color-5.5.0"
-      sources."tar-4.4.10"
+      sources."tar-4.4.11"
       sources."term-size-1.2.0"
       sources."through-2.3.8"
       sources."through2-2.0.5"
@@ -63528,7 +64564,7 @@ in
       sources."ecc-jsbn-0.1.2"
       sources."editorconfig-0.15.3"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.260"
+      sources."electron-to-chromium-1.3.264"
       sources."elliptic-6.5.1"
       sources."encodeurl-1.0.2"
       sources."entities-1.1.2"
@@ -63798,7 +64834,7 @@ in
       sources."os-tmpdir-1.0.2"
       sources."osenv-0.1.5"
       sources."pako-0.2.9"
-      sources."parse-asn1-5.1.4"
+      sources."parse-asn1-5.1.5"
       sources."parse-json-4.0.0"
       sources."parse5-5.1.0"
       sources."parseurl-1.3.3"
@@ -64146,7 +65182,7 @@ in
       sources."balanced-match-1.0.0"
       sources."base64-js-0.0.8"
       sources."bencode-2.0.1"
-      sources."big-integer-1.6.44"
+      sources."big-integer-1.6.45"
       sources."bitfield-0.1.0"
       (sources."bittorrent-dht-6.4.2" // {
         dependencies = [
@@ -64466,7 +65502,7 @@ in
       sources."balanced-match-1.0.0"
       sources."base64-arraybuffer-0.1.5"
       sources."base64-js-1.3.1"
-      sources."base64id-1.0.0"
+      sources."base64id-2.0.0"
       sources."basic-auth-2.0.1"
       sources."bcrypt-pbkdf-1.0.2"
       sources."bencode-0.7.0"
@@ -64535,18 +65571,21 @@ in
       sources."ee-first-1.1.1"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.1"
-      (sources."engine.io-3.3.2" // {
+      (sources."engine.io-3.4.0" // {
         dependencies = [
           sources."cookie-0.3.1"
-          sources."debug-3.1.0"
+          sources."debug-4.1.1"
+          sources."ms-2.1.2"
         ];
       })
-      (sources."engine.io-client-3.3.2" // {
+      (sources."engine.io-client-3.4.0" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-4.1.1"
+          sources."ms-2.1.2"
+          sources."ws-6.1.4"
         ];
       })
-      sources."engine.io-parser-2.1.3"
+      sources."engine.io-parser-2.2.0"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
       sources."express-4.17.1"
@@ -64719,22 +65758,31 @@ in
           sources."ws-2.3.1"
         ];
       })
-      (sources."socket.io-2.2.0" // {
+      (sources."socket.io-2.3.0" // {
         dependencies = [
           sources."debug-4.1.1"
           sources."ms-2.1.2"
         ];
       })
       sources."socket.io-adapter-1.1.1"
-      (sources."socket.io-client-2.2.0" // {
+      (sources."socket.io-client-2.3.0" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-4.1.1"
+          sources."isarray-2.0.1"
+          sources."ms-2.1.2"
+          (sources."socket.io-parser-3.3.0" // {
+            dependencies = [
+              sources."debug-3.1.0"
+              sources."ms-2.0.0"
+            ];
+          })
         ];
       })
-      (sources."socket.io-parser-3.3.0" // {
+      (sources."socket.io-parser-3.4.0" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-4.1.1"
           sources."isarray-2.0.1"
+          sources."ms-2.1.2"
         ];
       })
       sources."speedometer-0.1.4"
@@ -64777,7 +65825,7 @@ in
       sources."verror-1.10.0"
       sources."which-1.3.1"
       sources."wrappy-1.0.2"
-      sources."ws-6.1.4"
+      sources."ws-7.1.2"
       sources."xmlhttprequest-ssl-1.5.5"
       sources."xtend-4.0.2"
       sources."yeast-0.1.2"
@@ -64886,7 +65934,7 @@ in
       sources."builtin-status-codes-3.0.0"
       sources."cached-path-relative-1.0.2"
       sources."cipher-base-1.0.4"
-      sources."colors-1.3.3"
+      sources."colors-1.4.0"
       sources."combine-source-map-0.8.0"
       sources."concat-map-0.0.1"
       (sources."concat-stream-2.0.0" // {
@@ -64980,7 +66028,7 @@ in
       sources."os-browserify-0.3.0"
       sources."pako-1.0.10"
       sources."parents-1.0.1"
-      sources."parse-asn1-5.1.4"
+      sources."parse-asn1-5.1.5"
       sources."path-browserify-0.0.1"
       sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.6"
@@ -65483,13 +66531,13 @@ in
   serverless = nodeEnv.buildNodePackage {
     name = "serverless";
     packageName = "serverless";
-    version = "1.52.0";
+    version = "1.52.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/serverless/-/serverless-1.52.0.tgz";
-      sha512 = "No+hosiPng/0MKfFMNj6lfLmNmn5vzLduss55YkefQNKZ9oJEBeZqBDrUEZC9reTHUpilCx0ESiLqkMoPBst2g==";
+      url = "https://registry.npmjs.org/serverless/-/serverless-1.52.2.tgz";
+      sha512 = "JLRh52heei1kiTg/mdXdVeJXlB26nXI6uK3/jQvG2a16WwrXD+h033azkD9qqk7WgISLgDKPJbvlnsCAXLcX5Q==";
     };
     dependencies = [
-      sources."@serverless/cli-1.2.1"
+      sources."@serverless/cli-1.2.3"
       (sources."@serverless/component-metrics-1.0.8" // {
         dependencies = [
           sources."node-fetch-2.6.0"
@@ -65501,7 +66549,7 @@ in
           sources."semver-6.3.0"
         ];
       })
-      (sources."@serverless/enterprise-plugin-2.0.0" // {
+      (sources."@serverless/enterprise-plugin-3.0.0" // {
         dependencies = [
           sources."fs-extra-7.0.1"
           sources."node-fetch-2.6.0"
@@ -65549,10 +66597,9 @@ in
       sources."async-1.5.2"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
-      (sources."aws-sdk-2.529.0" // {
+      (sources."aws-sdk-2.533.0" // {
         dependencies = [
           sources."buffer-4.9.1"
-          sources."ieee754-1.1.8"
           sources."uuid-3.3.2"
         ];
       })
@@ -65591,7 +66638,7 @@ in
       sources."caw-2.0.1"
       sources."chalk-2.4.2"
       sources."chardet-0.7.0"
-      sources."chokidar-3.1.0"
+      sources."chokidar-3.1.1"
       sources."ci-info-1.6.0"
       (sources."class-utils-0.3.6" // {
         dependencies = [
@@ -65753,11 +66800,11 @@ in
       sources."get-stream-4.1.0"
       sources."get-value-2.0.6"
       sources."glob-7.1.4"
-      sources."glob-parent-5.0.0"
+      sources."glob-parent-5.1.0"
       sources."global-dirs-0.1.1"
       sources."globby-6.1.0"
       sources."got-9.6.0"
-      sources."graceful-fs-4.2.2"
+      sources."graceful-fs-4.2.1"
       sources."graceful-readlink-1.0.1"
       sources."graphlib-2.1.7"
       (sources."has-ansi-2.0.0" // {
@@ -65829,7 +66876,7 @@ in
       sources."is-retry-allowed-1.2.0"
       sources."is-stream-1.1.0"
       sources."is-windows-1.0.2"
-      sources."is-wsl-2.1.0"
+      sources."is-wsl-2.1.1"
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
       sources."iso8601-duration-1.2.0"
@@ -65908,7 +66955,7 @@ in
       sources."node-dir-0.1.17"
       sources."node-fetch-1.7.3"
       sources."normalize-path-3.0.0"
-      sources."normalize-url-4.3.0"
+      sources."normalize-url-4.4.1"
       (sources."npm-conf-1.1.3" // {
         dependencies = [
           sources."pify-3.0.0"
@@ -66155,7 +67202,7 @@ in
       sources."trim-repeated-1.0.0"
       sources."tslib-1.10.0"
       sources."tunnel-agent-0.6.0"
-      sources."type-1.0.3"
+      sources."type-1.2.0"
       sources."type-fest-0.5.2"
       sources."type-is-1.6.18"
       sources."typedarray-0.0.6"
@@ -66843,10 +67890,10 @@ in
   snyk = nodeEnv.buildNodePackage {
     name = "snyk";
     packageName = "snyk";
-    version = "1.227.0";
+    version = "1.228.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/snyk/-/snyk-1.227.0.tgz";
-      sha512 = "ejfq2FIca+b/zu4hkJwFUob1Emn+s9wXYw5VHJSS6BjiniNi6dIa24AARG3BWiVsN/3NvzCYAkcqhYGaJ6xyVw==";
+      url = "https://registry.npmjs.org/snyk/-/snyk-1.228.3.tgz";
+      sha512 = "TwyJcMXBvic1xJ+rVLdIYS1xDYuzcogIXdmyvGvXBZgwIQdjOVMnZBVxUo5igkOIntBL2sCynZiydQtGbe08JA==";
     };
     dependencies = [
       sources."@snyk/cli-interface-2.1.0"
@@ -67153,7 +68200,7 @@ in
           sources."debug-4.1.1"
         ];
       })
-      (sources."snyk-gradle-plugin-3.0.2" // {
+      (sources."snyk-gradle-plugin-3.1.0" // {
         dependencies = [
           sources."debug-4.1.1"
         ];
@@ -67286,10 +68333,10 @@ in
   "socket.io" = nodeEnv.buildNodePackage {
     name = "socket.io";
     packageName = "socket.io";
-    version = "2.2.0";
+    version = "2.3.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/socket.io/-/socket.io-2.2.0.tgz";
-      sha512 = "wxXrIuZ8AILcn+f1B4ez4hJTPG24iNgxBBDaJfT6MsyOhVYiTXWexGoPkd87ktJG8kQEcL/NBvRi64+9k4Kc0w==";
+      url = "https://registry.npmjs.org/socket.io/-/socket.io-2.3.0.tgz";
+      sha512 = "2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg==";
     };
     dependencies = [
       sources."accepts-1.3.7"
@@ -67298,7 +68345,7 @@ in
       sources."async-limiter-1.0.1"
       sources."backo2-1.0.2"
       sources."base64-arraybuffer-0.1.5"
-      sources."base64id-1.0.0"
+      sources."base64id-2.0.0"
       sources."better-assert-1.0.2"
       sources."blob-0.0.5"
       sources."callsite-1.0.0"
@@ -67307,19 +68354,13 @@ in
       sources."component-inherit-0.0.3"
       sources."cookie-0.3.1"
       sources."debug-4.1.1"
-      (sources."engine.io-3.3.2" // {
+      sources."engine.io-3.4.0"
+      (sources."engine.io-client-3.4.0" // {
         dependencies = [
-          sources."debug-3.1.0"
-          sources."ms-2.0.0"
-        ];
-      })
-      (sources."engine.io-client-3.3.2" // {
-        dependencies = [
-          sources."debug-3.1.0"
-          sources."ms-2.0.0"
+          sources."ws-6.1.4"
         ];
       })
-      sources."engine.io-parser-2.1.3"
+      sources."engine.io-parser-2.2.0"
       sources."has-binary2-1.0.3"
       sources."has-cors-1.1.0"
       sources."indexof-0.0.1"
@@ -67332,20 +68373,19 @@ in
       sources."parseqs-0.0.5"
       sources."parseuri-0.0.5"
       sources."socket.io-adapter-1.1.1"
-      (sources."socket.io-client-2.2.0" // {
-        dependencies = [
-          sources."debug-3.1.0"
-          sources."ms-2.0.0"
-        ];
-      })
-      (sources."socket.io-parser-3.3.0" // {
+      (sources."socket.io-client-2.3.0" // {
         dependencies = [
-          sources."debug-3.1.0"
           sources."ms-2.0.0"
+          (sources."socket.io-parser-3.3.0" // {
+            dependencies = [
+              sources."debug-3.1.0"
+            ];
+          })
         ];
       })
+      sources."socket.io-parser-3.4.0"
       sources."to-array-0.1.4"
-      sources."ws-6.1.4"
+      sources."ws-7.1.2"
       sources."xmlhttprequest-ssl-1.5.5"
       sources."yeast-0.1.2"
     ];
@@ -67668,7 +68708,7 @@ in
       sources."decode-uri-component-0.2.0"
       sources."deep-equal-1.1.0"
       sources."deep-extend-0.6.0"
-      (sources."deferred-leveldown-5.2.0" // {
+      (sources."deferred-leveldown-5.2.1" // {
         dependencies = [
           sources."abstract-leveldown-6.1.1"
         ];
@@ -67865,7 +68905,7 @@ in
           sources."string_decoder-0.10.31"
         ];
       })
-      (sources."leveldown-5.2.0" // {
+      (sources."leveldown-5.2.1" // {
         dependencies = [
           sources."abstract-leveldown-6.1.1"
         ];
@@ -68429,7 +69469,7 @@ in
       sources."async-1.5.2"
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
-      (sources."aws-sdk-2.529.0" // {
+      (sources."aws-sdk-2.533.0" // {
         dependencies = [
           sources."uuid-3.3.2"
         ];
@@ -68449,7 +69489,7 @@ in
       sources."balanced-match-1.0.0"
       sources."base64-arraybuffer-0.1.5"
       sources."base64-js-1.3.1"
-      sources."base64id-1.0.0"
+      sources."base64id-2.0.0"
       sources."base64url-3.0.1"
       sources."basic-auth-1.1.0"
       sources."bcrypt-pbkdf-1.0.2"
@@ -68553,19 +69593,21 @@ in
       sources."ejs-0.8.8"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.1"
-      (sources."engine.io-3.3.2" // {
+      (sources."engine.io-3.4.0" // {
         dependencies = [
-          sources."debug-3.1.0"
-          sources."ws-6.1.4"
+          sources."debug-4.1.1"
+          sources."ms-2.1.2"
+          sources."ws-7.1.2"
         ];
       })
-      (sources."engine.io-client-3.3.2" // {
+      (sources."engine.io-client-3.4.0" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-4.1.1"
+          sources."ms-2.1.2"
           sources."ws-6.1.4"
         ];
       })
-      sources."engine.io-parser-2.1.3"
+      sources."engine.io-parser-2.2.0"
       sources."error-ex-1.3.2"
       sources."escape-html-1.0.3"
       sources."escape-string-regexp-1.0.5"
@@ -68655,15 +69697,15 @@ in
           sources."inherits-2.0.3"
         ];
       })
-      (sources."http-proxy-1.17.0" // {
+      (sources."http-proxy-1.18.0" // {
         dependencies = [
-          sources."eventemitter3-3.1.2"
+          sources."eventemitter3-4.0.0"
         ];
       })
       sources."http-signature-1.1.1"
       sources."https-proxy-agent-1.0.0"
       sources."iconv-lite-0.4.24"
-      sources."ieee754-1.1.8"
+      sources."ieee754-1.1.13"
       sources."in-publish-2.0.0"
       sources."indexof-0.0.1"
       sources."inflight-1.0.6"
@@ -68952,22 +69994,31 @@ in
       sources."signal-exit-3.0.2"
       sources."slash-1.0.0"
       sources."sntp-1.0.9"
-      (sources."socket.io-2.2.0" // {
+      (sources."socket.io-2.3.0" // {
         dependencies = [
           sources."debug-4.1.1"
           sources."ms-2.1.2"
         ];
       })
       sources."socket.io-adapter-1.1.1"
-      (sources."socket.io-client-2.2.0" // {
+      (sources."socket.io-client-2.3.0" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-4.1.1"
+          sources."isarray-2.0.1"
+          sources."ms-2.1.2"
+          (sources."socket.io-parser-3.3.0" // {
+            dependencies = [
+              sources."debug-3.1.0"
+              sources."ms-2.0.0"
+            ];
+          })
         ];
       })
-      (sources."socket.io-parser-3.3.0" // {
+      (sources."socket.io-parser-3.4.0" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-4.1.1"
           sources."isarray-2.0.1"
+          sources."ms-2.1.2"
         ];
       })
       sources."source-map-0.6.1"
@@ -69012,7 +70063,7 @@ in
           sources."debug-3.2.6"
           sources."form-data-2.5.1"
           sources."ms-2.1.2"
-          sources."qs-6.8.0"
+          sources."qs-6.9.0"
           sources."readable-stream-2.3.6"
           sources."string_decoder-1.1.1"
         ];
@@ -69025,7 +70076,7 @@ in
           sources."esprima-4.0.1"
           sources."js-yaml-3.13.1"
           sources."lodash-3.10.1"
-          sources."qs-6.8.0"
+          sources."qs-6.9.0"
         ];
       })
       sources."swagger-schema-official-2.0.0-bab6bed"
@@ -69474,7 +70525,7 @@ in
         ];
       })
       sources."growl-1.9.2"
-      (sources."handlebars-4.2.0" // {
+      (sources."handlebars-4.2.1" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
@@ -69657,7 +70708,7 @@ in
         dependencies = [
           sources."debug-3.2.6"
           sources."ms-2.1.2"
-          sources."qs-6.8.0"
+          sources."qs-6.9.0"
           sources."superagent-3.8.3"
         ];
       })
@@ -71236,7 +72287,7 @@ in
       sources."minimalistic-assert-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
-      sources."minipass-2.6.2"
+      sources."minipass-2.8.1"
       sources."minizlib-1.2.2"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
@@ -71259,7 +72310,7 @@ in
         ];
       })
       sources."nopt-4.0.1"
-      sources."normalize-url-4.3.0"
+      sources."normalize-url-4.4.1"
       sources."npm-bundled-1.0.6"
       sources."npm-packlist-1.4.4"
       sources."npmlog-4.1.2"
@@ -71353,7 +72404,7 @@ in
       sources."strip-json-comments-2.0.1"
       sources."strip-outer-1.0.1"
       sources."supports-color-5.5.0"
-      sources."tar-4.4.10"
+      sources."tar-4.4.11"
       sources."thelounge-ldapjs-non-maintained-fork-1.0.4"
       sources."tlds-1.203.1"
       sources."to-array-0.1.4"
@@ -71781,7 +72832,7 @@ in
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-2.2.1"
       sources."chalk-1.1.3"
-      sources."colors-1.3.3"
+      sources."colors-1.4.0"
       sources."diff-2.2.3"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
@@ -72524,7 +73575,7 @@ in
       sources."graceful-fs-4.2.2"
       sources."graceful-readlink-1.0.1"
       sources."gray-matter-2.1.1"
-      sources."handlebars-4.2.0"
+      sources."handlebars-4.2.1"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
       (sources."has-ansi-2.0.0" // {
@@ -73820,7 +74871,7 @@ in
         dependencies = [
           sources."get-stream-5.1.0"
           sources."lowercase-keys-2.0.0"
-          sources."normalize-url-4.3.0"
+          sources."normalize-url-4.4.1"
         ];
       })
       (sources."caller-path-0.1.0" // {
@@ -74694,7 +75745,7 @@ in
         ];
       })
       sources."snapdragon-util-3.0.1"
-      (sources."snyk-1.227.0" // {
+      (sources."snyk-1.228.3" // {
         dependencies = [
           sources."ansi-regex-4.1.0"
           sources."debug-3.2.6"
@@ -74723,7 +75774,7 @@ in
           sources."tmp-0.0.33"
         ];
       })
-      (sources."snyk-gradle-plugin-3.0.2" // {
+      (sources."snyk-gradle-plugin-3.1.0" // {
         dependencies = [
           sources."debug-4.1.1"
           sources."ms-2.1.2"
@@ -74903,7 +75954,7 @@ in
       sources."tslib-1.10.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."type-1.0.3"
+      sources."type-1.2.0"
       sources."type-check-0.3.2"
       sources."type-fest-0.3.1"
       sources."typedarray-0.0.6"
@@ -75321,7 +76372,7 @@ in
       sources."p-try-2.2.0"
       sources."pako-1.0.10"
       sources."parallel-transform-1.2.0"
-      sources."parse-asn1-5.1.4"
+      sources."parse-asn1-5.1.5"
       sources."pascalcase-0.1.1"
       sources."path-browserify-0.0.1"
       sources."path-dirname-1.0.2"
@@ -75509,10 +76560,10 @@ in
   webpack-cli = nodeEnv.buildNodePackage {
     name = "webpack-cli";
     packageName = "webpack-cli";
-    version = "3.3.8";
+    version = "3.3.9";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.8.tgz";
-      sha512 = "RANYSXwikSWINjHMd/mtesblNSpjpDLoYTBtP99n1RhXqVI/wxN40Auqy42I7y4xrbmRBoA5Zy5E0JSBD5XRhw==";
+      url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.9.tgz";
+      sha512 = "xwnSxWl8nZtBl/AFJCOn9pG7s5CYUYdZxmmukv+fAHLcBIHM36dImfpQg3WfShZXeArkWlf6QRw24Klcsv8a5A==";
     };
     dependencies = [
       sources."ansi-regex-4.1.0"
@@ -75879,8 +76930,10 @@ in
       (sources."bittorrent-tracker-9.14.4" // {
         dependencies = [
           sources."debug-4.1.1"
+          sources."decompress-response-4.2.1"
+          sources."mimic-response-2.0.0"
           sources."ms-2.1.2"
-          sources."simple-get-3.0.3"
+          sources."simple-get-3.1.0"
         ];
       })
       sources."blob-to-buffer-1.2.8"
@@ -75981,7 +77034,9 @@ in
       sources."last-one-wins-1.0.4"
       (sources."load-ip-set-2.1.0" // {
         dependencies = [
-          sources."simple-get-3.0.3"
+          sources."decompress-response-4.2.1"
+          sources."mimic-response-2.0.0"
+          sources."simple-get-3.1.0"
         ];
       })
       sources."long-4.0.0"
@@ -76026,7 +77081,9 @@ in
       sources."parse-numeric-range-0.0.2"
       (sources."parse-torrent-7.0.1" // {
         dependencies = [
-          sources."simple-get-3.0.3"
+          sources."decompress-response-4.2.1"
+          sources."mimic-response-2.0.0"
+          sources."simple-get-3.1.0"
         ];
       })
       sources."path-is-absolute-1.0.1"
@@ -76067,7 +77124,7 @@ in
       sources."semver-5.1.1"
       sources."simple-concat-1.0.0"
       sources."simple-get-2.8.1"
-      (sources."simple-peer-9.5.0" // {
+      (sources."simple-peer-9.6.0" // {
         dependencies = [
           sources."debug-4.1.1"
           sources."ms-2.1.2"
@@ -76123,8 +77180,10 @@ in
       (sources."webtorrent-0.107.16" // {
         dependencies = [
           sources."debug-4.1.1"
+          sources."decompress-response-4.2.1"
+          sources."mimic-response-2.0.0"
           sources."ms-2.1.2"
-          sources."simple-get-3.0.3"
+          sources."simple-get-3.1.0"
         ];
       })
       sources."winreg-1.2.4"
@@ -76431,7 +77490,7 @@ in
         ];
       })
       sources."glob-to-regexp-0.3.0"
-      (sources."global-agent-2.1.0" // {
+      (sources."global-agent-2.1.1" // {
         dependencies = [
           sources."semver-6.3.0"
         ];
diff --git a/nixpkgs/pkgs/development/node-packages/node-packages-v12.nix b/nixpkgs/pkgs/development/node-packages/node-packages-v12.nix
index 63b388f88eb7..dcc1c73c0fcd 100644
--- a/nixpkgs/pkgs/development/node-packages/node-packages-v12.nix
+++ b/nixpkgs/pkgs/development/node-packages/node-packages-v12.nix
@@ -1255,13 +1255,13 @@ let
         sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
       };
     };
-    "minipass-2.6.2" = {
+    "minipass-2.8.1" = {
       name = "minipass";
       packageName = "minipass";
-      version = "2.6.2";
+      version = "2.8.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minipass/-/minipass-2.6.2.tgz";
-        sha512 = "38Jwdc8AttUDaQAIRX8Iaw3QoCDWjAwKMGeGDF9JUi9QCPMjH5qAQg/hdO8o1nC7Nmh1/CqzMg5FQPEKuKwznQ==";
+        url = "https://registry.npmjs.org/minipass/-/minipass-2.8.1.tgz";
+        sha512 = "QCG523ParRcE2+9A6wYh9UI3uy2FFLw4DQaVYQrY5HPfszc5M6VDD+j0QCwHm19LI2imes4RB+NBD8cOJccyCg==";
       };
     };
     "minizlib-1.2.2" = {
@@ -2038,13 +2038,13 @@ let
         sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf";
       };
     };
-    "tar-4.4.10" = {
+    "tar-4.4.11" = {
       name = "tar";
       packageName = "tar";
-      version = "4.4.10";
+      version = "4.4.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar/-/tar-4.4.10.tgz";
-        sha512 = "g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==";
+        url = "https://registry.npmjs.org/tar/-/tar-4.4.11.tgz";
+        sha512 = "iI4zh3ktLJKaDNZKZc+fUONiQrSn9HkCFzamtb7k8FFmVilHVob7QsLX/VySAW8lAviMzMbFw4QtFb4errwgYA==";
       };
     };
     "temp-0.9.0" = {
@@ -2675,7 +2675,7 @@ in
       sources."mime-types-2.1.24"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      sources."minipass-2.6.2"
+      sources."minipass-2.8.1"
       sources."minizlib-1.2.2"
       sources."mkdirp-0.5.1"
       sources."ncp-0.4.2"
@@ -2748,7 +2748,7 @@ in
         ];
       })
       sources."strip-ansi-3.0.1"
-      sources."tar-4.4.10"
+      sources."tar-4.4.11"
       sources."temp-0.9.0"
       (sources."tough-cookie-2.4.3" // {
         dependencies = [
diff --git a/nixpkgs/pkgs/development/ocaml-modules/containers/default.nix b/nixpkgs/pkgs/development/ocaml-modules/containers/default.nix
index 98fd7fc46cf6..1b465c2984ec 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/containers/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/containers/default.nix
@@ -1,53 +1,26 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, cppo, gen, sequence, qtest, ounit, result
-, qcheck }:
+{ lib, fetchFromGitHub, buildDunePackage, ocaml
+, iter, result, uchar
+, gen, mdx, ounit, qcheck, uutf
+}:
 
-let
-
-  mkpath = p:
-      "${p}/lib/ocaml/${ocaml.version}/site-lib";
-
-  version = "1.4";
-
-in
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-containers-${version}";
+buildDunePackage rec {
+  version = "2.6.1";
+  pname = "containers";
 
   src = fetchFromGitHub {
     owner = "c-cube";
     repo = "ocaml-containers";
     rev = version;
-    sha256 = "1wbarxphdrxvy7qsdp4p837h1zrv0z83pgs5lbz2h3kdnyvz2f1i";
+    sha256 = "02iq01pq6047hab5s8zpprwr21cygvzfcfj2lpsyj823f28crhmv";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild cppo gen sequence qtest ounit qcheck ];
-
-  propagatedBuildInputs = [ result ];
-
-  preConfigure = ''
-    # The following is done so that the '#use "topfind"' directive works in the ocaml top-level
-    export HOME="$(mktemp -d)"
-    export OCAML_TOPLEVEL_PATH="${mkpath findlib}"
-    cat <<EOF > $HOME/.ocamlinit
-let () =
-  try Topdirs.dir_directory (Sys.getenv "OCAML_TOPLEVEL_PATH")
-  with Not_found -> ()
-;;
-EOF
-  '';
+  buildInputs = [ iter ];
 
-  configureFlags = [
-    "--enable-unix"
-    "--enable-thread"
-    "--enable-tests"
-    "--enable-docs"
-    "--disable-bench"
-  ];
+  checkInputs = lib.optionals doCheck [ gen mdx ounit qcheck uutf ];
 
-  doCheck = true;
-  checkTarget = "test";
+  propagatedBuildInputs = [ result uchar ];
 
-  createFindlibDestdir = true;
+  doCheck = !lib.versionAtLeast ocaml.version "4.08";
 
   meta = {
     homepage = https://github.com/c-cube/ocaml-containers;
@@ -62,7 +35,6 @@ EOF
       It also features optional libraries for dealing with strings, and
       helpers for unix and threads.
     '';
-    license = stdenv.lib.licenses.bsd2;
-    platforms = ocaml.meta.platforms or [];
+    license = lib.licenses.bsd2;
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/sequence/default.nix b/nixpkgs/pkgs/development/ocaml-modules/iter/default.nix
index e5ead36d1c19..eb2ca1409ab8 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/sequence/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/iter/default.nix
@@ -1,22 +1,20 @@
-{ stdenv, fetchFromGitHub, buildDunePackage, qtest, result }:
+{ lib, fetchFromGitHub, buildDunePackage, ocaml, mdx, qtest, result }:
 
 buildDunePackage rec {
-  pname = "sequence";
-  version = "1.1";
-
-  minimumOCamlVersion = "4.02";
+  pname = "iter";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "c-cube";
     repo = pname;
     rev = version;
-    sha256 = "08j37nldw47syq3yw4mzhhvya43knl0d7biddp0q9hwbaxhzgi44";
+    sha256 = "0j2sg50byn0ppmf6l36ksip7zx1d3gv7sc4hbbxs2rmx39jr7vxh";
   };
 
-  buildInputs = [ qtest ];
+  buildInputs = lib.optionals doCheck [ mdx qtest ];
   propagatedBuildInputs = [ result ];
 
-  doCheck = true;
+  doCheck = lib.versionAtLeast ocaml.version "4.04";
 
   meta = {
     homepage = https://github.com/c-cube/sequence;
@@ -27,6 +25,6 @@ buildDunePackage rec {
       like `filter`, `map`, `take`, `drop` and `append` can be performed before the
       sequence is iterated/folded on.
     '';
-    license = stdenv.lib.licenses.bsd2;
+    license = lib.licenses.bsd2;
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix
index 29fee1b63184..0b43cf461e01 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix
@@ -1,11 +1,9 @@
-{ stdenv, fetchFromGitHub, buildDunePackage, astring, cmdliner, cppo, fmt, logs, ocaml-migrate-parsetree, ocaml_lwt, pandoc, re }:
+{ lib, fetchFromGitHub, buildDunePackage, ocaml, astring, cmdliner, cppo, fmt, logs, ocaml-migrate-parsetree, ocaml_lwt, pandoc, re }:
 
 buildDunePackage rec {
   pname = "mdx";
   version = "1.4.0";
 
-  minimumOCamlVersion = "4.05";
-
   src = fetchFromGitHub {
     owner = "realworldocaml";
     repo = pname;
@@ -15,14 +13,16 @@ buildDunePackage rec {
 
   nativeBuildInputs = [ cppo ];
   buildInputs = [ astring cmdliner fmt logs ocaml-migrate-parsetree re ];
-  checkInputs = [ ocaml_lwt pandoc ];
+  checkInputs = lib.optionals doCheck [ ocaml_lwt pandoc ];
+
+  doCheck = !lib.versionAtLeast ocaml.version "4.08";
 
-  doCheck = true;
+  dontStrip = lib.versions.majorMinor ocaml.version == "4.04";
 
   meta = {
     homepage = https://github.com/realworldocaml/mdx;
     description = "Executable OCaml code blocks inside markdown files";
-    license = stdenv.lib.licenses.isc;
-    maintainers = [ stdenv.lib.maintainers.romildo ];
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.romildo ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocaml-protoc/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocaml-protoc/default.nix
new file mode 100644
index 000000000000..1ef7b6c2d40b
--- /dev/null
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocaml-protoc/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, ocaml, fetchFromGitHub, ocamlbuild, findlib, ppx_deriving_protobuf }:
+
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-ocaml-protoc-${version}";
+  version = "1.2.0";
+
+  minimumOCamlVersion = "4.02";
+
+  src = fetchFromGitHub {
+    owner = "mransan";
+    repo = "ocaml-protoc";
+    rev = "60d2d4dd55f73830e1bed603cc44d3420430632c";
+    sha256 = "1d1p8ch723z2qa9azmmnhbcpwxbpzk3imh1cgkjjq4p5jwzj8amj";
+  };
+
+  installPhase = ''
+    mkdir -p tmp/bin
+    export PREFIX=`pwd`/tmp
+    make all.install.build
+    make check_install
+    make lib.install
+    make bin.install
+  '';
+
+  buildInputs = [ ocaml findlib ocamlbuild ];
+  propagatedBuildInputs = [ ppx_deriving_protobuf ];
+
+  createFindlibDestdir = true;
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/mransan/ocaml-protoc";
+    description = "A Protobuf Compiler for OCaml";
+    license = licenses.mit;
+    maintainers = [ maintainers.vyorkin ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/odoc/default.nix b/nixpkgs/pkgs/development/ocaml-modules/odoc/default.nix
index 0b342a654e6e..75a2dab970ee 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/odoc/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/odoc/default.nix
@@ -1,22 +1,24 @@
-{ stdenv, fetchFromGitHub, buildDunePackage, cppo, bos, cmdliner, tyxml }:
+{ lib, fetchFromGitHub, buildDunePackage
+, astring, cmdliner, cppo, fpath, result, tyxml
+}:
 
 buildDunePackage rec {
   pname = "odoc";
-  version = "1.3.0";
+  version = "1.4.2";
 
   src = fetchFromGitHub {
     owner = "ocaml";
     repo = pname;
     rev = version;
-    sha256 = "0hjan5aj5zk8j8qyagv9r4hqm469mh207cv2m6kxwgnw0c3cz7sy";
+    sha256 = "0rvhx139jx6wmlfz355mja6mk03x4swq1xxvk5ky6jzhalq3cf5i";
   };
 
-  buildInputs = [ cppo bos cmdliner tyxml ];
+  buildInputs = [ astring cmdliner cppo fpath result tyxml ];
 
   meta = {
     description = "A documentation generator for OCaml";
-    license = stdenv.lib.licenses.isc;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.vbgl ];
     inherit (src.meta) homepage;
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/optint/default.nix b/nixpkgs/pkgs/development/ocaml-modules/optint/default.nix
index 613973200d2d..508bbfba6055 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/optint/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/optint/default.nix
@@ -1,28 +1,18 @@
-{ stdenv, fetchurl, ocaml, findlib, dune }:
+{ lib, buildDunePackage, fetchurl }:
 
-if !stdenv.lib.versionAtLeast ocaml.version "4.02"
-then throw "optint is not available for OCaml ${ocaml.version}"
-else
-
-stdenv.mkDerivation rec {
-  version = "0.0.2";
-  name = "ocaml${ocaml.version}-optint-${version}";
+buildDunePackage rec {
+  minimumOCamlVersion = "4.03";
+  version = "0.0.3";
+  pname = "optint";
   src = fetchurl {
-    url = "https://github.com/mirage/optint/releases/download/v0.0.2/optint-v0.0.2.tbz";
-    sha256 = "1lmb7nycmkr05y93slqi98i1lcs1w4kcngjzjwz7i230qqjpw9w1";
+    url = "https://github.com/mirage/optint/releases/download/v${version}/optint-v${version}.tbz";
+    sha256 = "0c7r3s6lal9xkixngkj25nqncj4s33ka40bjdi7fz7mly08djycj";
   };
 
-  buildInputs = [ ocaml findlib dune ];
-
-  buildPhase = "dune build";
-
-  inherit (dune) installPhase;
-
   meta = {
     homepage = "https://github.com/mirage/optint";
     description = "Abstract type of integer between x64 and x86 architecture";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
-    inherit (ocaml.meta) platforms;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.vbgl ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/owee/default.nix b/nixpkgs/pkgs/development/ocaml-modules/owee/default.nix
index 7ac6af3edd93..9eb81003d47a 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/owee/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/owee/default.nix
@@ -1,25 +1,21 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib }:
+{ lib, buildDunePackage, fetchFromGitHub }:
 
-stdenv.mkDerivation rec {
-  name = "ocaml${ocaml.version}-owee-${version}";
-  version = "0.2";
+buildDunePackage rec {
+  minimumOCamlVersion = "4.06";
+  pname = "owee";
+  version = "0.3";
 
   src = fetchFromGitHub {
     owner = "let-def";
     repo = "owee";
     rev = "v${version}";
-    sha256 = "025a8sm03mm9qr7grdmdhzx7pyrd0dr7ndr5mbj5baalc0al132z";
+    sha256 = "0jp8ca57488d7sj2nqy4yxcdpda6sxx51yyi8k6888hbinhyqp0j";
   };
 
-  buildInputs = [ ocaml findlib ];
-
-  createFindlibDestdir = true;
-
   meta = {
     description = "An experimental OCaml library to work with DWARF format";
     inherit (src.meta) homepage;
-    inherit (ocaml.meta) platforms;
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.vbgl ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix
new file mode 100644
index 000000000000..7746200d4ff4
--- /dev/null
+++ b/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix
@@ -0,0 +1,18 @@
+{ lib, buildDunePackage, rpclib, ppxfind, ppx_deriving, cppo }:
+
+buildDunePackage rec {
+  pname = "ppx_deriving_rpc";
+
+  inherit (rpclib) version src;
+
+  buildInputs = [ ppxfind cppo ];
+
+  propagatedBuildInputs = [ rpclib ppx_deriving ];
+
+  meta = with lib; {
+    homepage = "https://github.com/mirage/ocaml-rpc";
+    description = "Ppx deriver for ocaml-rpc";
+    license = licenses.isc;
+    maintainers = [ maintainers.vyorkin ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/printbox/default.nix b/nixpkgs/pkgs/development/ocaml-modules/printbox/default.nix
index b4b733ed7d84..50866e1d9691 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/printbox/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/printbox/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildDunePackage, mdx }:
+{ lib, fetchFromGitHub, buildDunePackage, ocaml, mdx }:
 
 buildDunePackage rec {
   pname = "printbox";
@@ -13,14 +13,14 @@ buildDunePackage rec {
     sha256 = "16nwwpp13hzlcm9xqfxc558afm3i5s802dkj69l9s2vp04lgms5n";
   };
 
-  checkInputs = [ mdx ];
+  checkInputs = lib.optional doCheck mdx;
 
-  doCheck = true;
+  doCheck = !lib.versionAtLeast ocaml.version "4.08";
 
   meta = {
     homepage = https://github.com/c-cube/printbox/;
     description = "Allows to print nested boxes, lists, arrays, tables in several formats";
-    license = stdenv.lib.licenses.isc;
-    maintainers = [ stdenv.lib.maintainers.romildo ];
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.romildo ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/spacetime_lib/default.nix b/nixpkgs/pkgs/development/ocaml-modules/spacetime_lib/default.nix
index 1eb789ec2690..6b1b45cb2fb4 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/spacetime_lib/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/spacetime_lib/default.nix
@@ -1,30 +1,22 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, owee }:
+{ lib, fetchFromGitHub, buildDunePackage, owee }:
 
-if !stdenv.lib.versionAtLeast ocaml.version "4.04"
-then throw "spacetime_lib is not available for OCaml ${ocaml.version}" else
-
-stdenv.mkDerivation rec {
-  name = "ocaml${ocaml.version}-spacetime_lib-${version}";
-  version = "0.1.0";
+buildDunePackage rec {
+  pname = "spacetime_lib";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "lpw25";
     repo = "spacetime_lib";
     rev = version;
-    sha256 = "1g91y6wl3z18jhaz2q03wn54zj6xk1qcjidr1nc6nq9a8906lcq5";
+    sha256 = "0biisgbycr5v3nm5jp8i0h6vq76vzasdjkcgh8yr7fhxc81jgv3p";
   };
 
-  buildInputs = [ ocaml findlib ];
-
   propagatedBuildInputs = [ owee ];
 
-  createFindlibDestdir = true;
-
   meta = {
     description = "An OCaml library providing some simple operations for handling OCaml “spacetime” profiles";
     inherit (src.meta) homepage;
-    inherit (ocaml.meta) platforms;
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.vbgl ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/Logbook/default.nix b/nixpkgs/pkgs/development/python-modules/Logbook/default.nix
index 866c04109294..503fefc0013c 100644
--- a/nixpkgs/pkgs/development/python-modules/Logbook/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/Logbook/default.nix
@@ -18,6 +18,9 @@ buildPythonPackage rec {
     py.test tests
   '';
 
+  # Some of the tests use localhost networking.
+  __darwinAllowLocalNetworking = true;
+
   meta = {
     homepage = https://pythonhosted.org/Logbook/;
     description = "A logging replacement for Python";
diff --git a/nixpkgs/pkgs/development/python-modules/algebraic-data-types/default.nix b/nixpkgs/pkgs/development/python-modules/algebraic-data-types/default.nix
new file mode 100644
index 000000000000..4b4986795ce1
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/algebraic-data-types/default.nix
@@ -0,0 +1,28 @@
+{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, hypothesis, mypy }:
+
+buildPythonPackage rec {
+  pname = "algebraic-data-types";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    owner = "jspahrsummers";
+    repo = "adt";
+    rev = "v" + version;
+    sha256 = "1py94jsgh6wch59n9dxnwvk74psbpa1679zfmripa1qfc2218kqi";
+  };
+
+  disabled = pythonOlder "3.6";
+
+  checkInputs = [
+    hypothesis
+    mypy
+  ];
+
+  meta = with lib; {
+    description = "Algebraic data types for Python";
+    homepage = https://github.com/jspahrsummers/adt;
+    license = licenses.mit;
+    maintainers = with maintainers; [ uri-canva ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/astropy/default.nix b/nixpkgs/pkgs/development/python-modules/astropy/default.nix
index f46ca274f2e1..35bb7b1aa59a 100644
--- a/nixpkgs/pkgs/development/python-modules/astropy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/astropy/default.nix
@@ -39,6 +39,9 @@ buildPythonPackage rec {
     pytest
   '';
 
+  # 368 failed, 10889 passed, 978 skipped, 69 xfailed in 196.24s
+  doCheck = false;
+
   meta = {
     description = "Astronomy/Astrophysics library for Python";
     homepage = https://www.astropy.org;
diff --git a/nixpkgs/pkgs/development/python-modules/aws-adfs/default.nix b/nixpkgs/pkgs/development/python-modules/aws-adfs/default.nix
index 9e761b3698d6..4912e8f99943 100644
--- a/nixpkgs/pkgs/development/python-modules/aws-adfs/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aws-adfs/default.nix
@@ -2,12 +2,12 @@
 , pytest, pytestrunner, pytestcov, mock, glibcLocales, lxml, boto3, requests, click, configparser }:
 
 buildPythonPackage rec {
-  version = "1.12.3";
   pname = "aws-adfs";
+  version = "1.17.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b7df3fbe0572eb12294b2e072327ca97fd94d435b39cc10612e460cde914b831";
+    sha256 = "0wnsmwjpfhxilmvrqvwilcf3h9p5m5ixi5gn9bgkr3gwd2laxf54";
   };
 
   # Relax version constraint
@@ -24,10 +24,10 @@ buildPythonPackage rec {
   checkInputs = [ glibcLocales pytest pytestrunner pytestcov mock ];
   propagatedBuildInputs = [ lxml boto3 requests click configparser ];
 
-  meta = {
+  meta = with lib; {
     description = "Command line tool to ease aws cli authentication against ADFS";
     homepage = https://github.com/venth/aws-adfs;
-    license = lib.licenses.psfl;
-    maintainers = [ lib.maintainers.bhipple ];
+    license = licenses.psfl;
+    maintainers = [ maintainers.bhipple ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/cairocffi/default.nix b/nixpkgs/pkgs/development/python-modules/cairocffi/default.nix
index f91b33d20102..574aeefa7fca 100644
--- a/nixpkgs/pkgs/development/python-modules/cairocffi/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cairocffi/default.nix
@@ -19,8 +19,8 @@
 }@args:
 
 import ./generic.nix ({
-  version = "1.0.2";
-  sha256 = "01ac51ae12c4324ca5809ce270f9dd1b67f5166fe63bd3e497e9ea3ca91946ff";
+  version = "1.1.0";
+  sha256 = "1nq53f5jipgy9jgyfxp43j40qfbmrhgn1cj8bp5rrb3liy3wbh7i";
   dlopen_patch = ./dlopen-paths.patch;
   disabled = pythonOlder "3.5";
   inherit withXcffib;
diff --git a/nixpkgs/pkgs/development/python-modules/cairocffi/dlopen-paths.patch b/nixpkgs/pkgs/development/python-modules/cairocffi/dlopen-paths.patch
index 10e2294981d4..6542b4367eb4 100644
--- a/nixpkgs/pkgs/development/python-modules/cairocffi/dlopen-paths.patch
+++ b/nixpkgs/pkgs/development/python-modules/cairocffi/dlopen-paths.patch
@@ -1,46 +1,61 @@
-commit 0435bc2577d4b18f54b78b2f5185abb2b2005982
-Author: Alexander V. Nikolaev <avn@avnik.info>
-Date:   Sat Feb 6 08:09:06 2016 +0200
+Patch dlopen() to allow direct paths to all required libs
 
-    Patch dlopen() to allow direct paths to all required libs
+This is an update of the patch submitted in
+https://github.com/NixOS/nixpkgs/commit/b13e44e094989d3a902f8c73b22e8d3c0cc7acf4
+by Alexander V. Nikolaev <avn@avnik.info>
 
-    This patch is NixOS specific
+---
+ cairocffi/__init__.py | 34 ++++++++++++++++------------------
+ 1 file changed, 16 insertions(+), 18 deletions(-)
 
 diff --git a/cairocffi/__init__.py b/cairocffi/__init__.py
-index 6061973..3538a58 100644
+index 307d58c..43c29e3 100644
 --- a/cairocffi/__init__.py
 +++ b/cairocffi/__init__.py
-@@ -21,19 +21,22 @@ VERSION = __version__ = (Path(__file__).parent / 'VERSION').read_text().strip()
- version = '1.16.0'
- version_info = (1, 16, 0)
+@@ -21,28 +21,26 @@ VERSION = __version__ = (Path(__file__).parent / 'VERSION').read_text().strip()
+ version = '1.17.2'
+ version_info = (1, 17, 2)
 
-+# Use hardcoded soname, because ctypes.util use gcc/objdump which shouldn't be required for runtime
++# Use hardcoded soname, because ctypes.util use gcc/objdump which shouldn't be
++# required for runtime
 +_LIBS = {
 +    'cairo': '@cairo@/lib/libcairo@ext@',
 +    'glib-2.0': '@glib@/lib/libglib-2.0@ext@',
 +    'gobject-2.0': '@glib@/lib/libgobject-2.0@ext@',
 +    'gdk_pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0@ext@',
 +}
++
 
--def dlopen(ffi, *names):
-+def dlopen(ffi, name, *names):
+ def dlopen(ffi, library_names, filenames):
      """Try various names for the same library, for different platforms."""
--    for name in names:
--        for lib_name in (name, 'lib' + name):
--            try:
--                path = ctypes.util.find_library(lib_name)
--                lib = ffi.dlopen(path or lib_name)
--                if lib:
--                    return lib
--            except OSError:
--                pass
--    raise OSError("dlopen() failed to load a library: %s" % ' / '.join(names))
-+    path = _LIBS.get(name, None)
-+    if path:
-+        lib = ffi.dlopen(path)
-+        if lib:
-+            return lib
-+    raise OSError("dlopen() failed to load a library: %s as %s" % (name, path))
+-    exceptions = []
+-
+     for library_name in library_names:
+-        library_filename = find_library(library_name)
+-        if library_filename:
+-            filenames = (library_filename,) + filenames
+-        else:
+-            exceptions.append(
+-                'no library called "{}" was found'.format(library_name))
+-
+-    for filename in filenames:
+-        try:
+-            return ffi.dlopen(filename)
+-        except OSError as exception:  # pragma: no cover
+-            exceptions.append(exception)
+-
+-    error_message = '\n'.join(  # pragma: no cover
+-        str(exception) for exception in exceptions)
+-    raise OSError(error_message)  # pragma: no cover
++        path = _LIBS.get(library_name, None)
++        if path:
++            lib = ffi.dlopen(path)
++            if lib:
++                return lib
++
++    raise OSError("dlopen() failed to load a library: %s as %s" % (library_name, path))
 
 
- cairo = dlopen(ffi, 'cairo', 'cairo-2', 'cairo-gobject-2', 'cairo.so.2')
+ cairo = dlopen(
+--
+2.19.2
diff --git a/nixpkgs/pkgs/development/python-modules/cheroot/default.nix b/nixpkgs/pkgs/development/python-modules/cheroot/default.nix
index 591bb0fbe377..9b3050942a88 100644
--- a/nixpkgs/pkgs/development/python-modules/cheroot/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cheroot/default.nix
@@ -34,6 +34,9 @@ buildPythonPackage rec {
     pytest -k 'not tls' ${lib.optionalString stdenv.isDarwin "--deselect=cheroot/test/test_ssl.py::test_http_over_https_error --deselect=cheroot/test/test_server.py::test_bind_addr_unix"}
   '';
 
+  # Some of the tests use localhost networking.
+  __darwinAllowLocalNetworking = true;
+
   meta = with lib; {
     description = "High-performance, pure-Python HTTP";
     homepage = https://github.com/cherrypy/cheroot;
diff --git a/nixpkgs/pkgs/development/python-modules/csvs-to-sqlite/default.nix b/nixpkgs/pkgs/development/python-modules/csvs-to-sqlite/default.nix
index ab9ca9827186..0e5e902be2e3 100644
--- a/nixpkgs/pkgs/development/python-modules/csvs-to-sqlite/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/csvs-to-sqlite/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
+, isPy3k
 , pytestrunner
 , click
 , dateparser
@@ -12,17 +13,16 @@
 
 buildPythonPackage rec {
   pname = "csvs-to-sqlite";
-  version = "0.9";
+  version = "1.0";
+  disabled = !isPy3k;
 
   src = fetchFromGitHub {
     owner = "simonw";
     repo = pname;
     rev = version;
-    sha256 = "0js86m4kj70g9n9gagr8l6kgswqllg6hn1xa3yvxwv95i59ihpz5";
+    sha256 = "0n80y9a6qhbhhbz64jdpscx0nha9jn9nygp9nkgszmw04ri5j5hm";
   };
 
-  buildInputs = [ pytestrunner ];
-
   propagatedBuildInputs = [
     click
     dateparser
diff --git a/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix b/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix
index af2607bca146..e135d8c7bc6a 100644
--- a/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix
@@ -9,11 +9,11 @@ in
 
 buildPythonPackage rec {
   pname = "dependency-injector";
-  version = "3.14.6";
+  version = "3.14.10";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2e1889a0981381f557b0d14cba900adf7476817c53c13bfb04e2a30b3db0f1d3";
+    sha256 = "1c475axh40f8s4n5dqm52qczx9g2g8b8wsy0qvghirk84ikpca5y";
   };
 
   propagatedBuildInputs = [ six ];
diff --git a/nixpkgs/pkgs/development/python-modules/dotnetcore2/default.nix b/nixpkgs/pkgs/development/python-modules/dotnetcore2/default.nix
new file mode 100644
index 000000000000..caafeb54740f
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/dotnetcore2/default.nix
@@ -0,0 +1,59 @@
+{ stdenv, lib, buildPythonPackage, fetchPypi, python, isPy27
+, dotnet-sdk
+, substituteAll
+, distro
+, unzip
+}:
+
+buildPythonPackage rec {
+  pname = "dotnetcore2";
+  version = "2.1.8.1";
+  format = "wheel";
+  disabled = isPy27;
+
+  src = fetchPypi {
+    inherit pname version format;
+    python = "py3";
+    platform = "manylinux1_x86_64";
+    sha256 = "13zrff5j767d3f8drl397sjhl28winsrfa8pa20svf00xfcsy34s";
+  };
+
+  nativeBuildInputs = [ unzip ];
+
+  propagatedBuildInputs = [ distro ];
+
+  # needed to apply patches
+  prePatch = ''
+    unzip dist/dotnet*
+  '';
+
+  patches = [
+    ( substituteAll {
+        src = ./runtime.patch;
+        dotnet = dotnet-sdk;
+      }
+    )
+  ];
+
+  # unfortunately the noraml pip install fails because the manylinux1 format check fails with NixOS
+  installPhase = ''
+    mkdir -p $out/${python.sitePackages}/${pname}
+    # copy metadata
+    cp -r dotnetcore2-2* $out/${python.sitePackages}
+    # copy non-dotnetcore related files
+    cp -r dotnetcore2/{__init__.py,runtime.py} $out/${python.sitePackages}/${pname}
+  '';
+
+  # no tests, ensure it's one useful function works
+  checkPhase = ''
+    ${python.interpreter} -c 'from dotnetcore2 import runtime; print(runtime.get_runtime_path())'
+  '';
+
+  meta = with lib; {
+    description = "DotNet Core runtime";
+    homepage = "https://github.com/dotnet/core";
+    license = licenses.mit;
+    platforms = [ "x86_64-linux" ];
+    maintainers = with maintainers; [ jonringer ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/dotnetcore2/runtime.patch b/nixpkgs/pkgs/development/python-modules/dotnetcore2/runtime.patch
new file mode 100644
index 000000000000..54322087a780
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/dotnetcore2/runtime.patch
@@ -0,0 +1,19 @@
+diff a/dotnetcore2/runtime.py b/dotnetcore2/runtime.py
+--- a/dotnetcore2/runtime.py
++++ b/dotnetcore2/runtime.py
+@@ -39,13 +39,13 @@ def _get_bin_folder() -> str:
+ 
+ 
+ def get_runtime_path():
++    return "@dotnet@/dotnet"
+     search_string = os.path.join(_get_bin_folder(), 'dotnet*')
+     matches = [f for f in glob.glob(search_string, recursive=True)]
+     return matches[0]
+ 
+ def ensure_dependencies() -> Optional[str]:
+-    if dist is None:
+-        return None
++    return None
+ 
+     bin_folder = _get_bin_folder()
+     deps_path = os.path.join(bin_folder, 'deps')
diff --git a/nixpkgs/pkgs/development/python-modules/dynd/default.nix b/nixpkgs/pkgs/development/python-modules/dynd/default.nix
index d4cd0e711a0d..f3e4e0a8b732 100644
--- a/nixpkgs/pkgs/development/python-modules/dynd/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/dynd/default.nix
@@ -26,6 +26,8 @@ buildPythonPackage rec {
     substituteInPlace setup.py --replace "'--always', '--match', 'v*']).decode('ascii').strip('\n')" ""
   '';
 
+  dontUseCmakeConfigure = true;
+
   # Python 3 works but has a broken import test that I couldn't
   # figure out.
   doCheck = !isPy3k;
diff --git a/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix b/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix
index d61f5a776004..693e733e73a8 100644
--- a/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, buildPythonPackage, fetchPypi, flask, pyjwt, werkzeug, pytest }:
+{ stdenv, buildPythonPackage, fetchPypi, dateutil, flask, pyjwt, werkzeug, pytest }:
 
 buildPythonPackage rec {
   pname = "Flask-JWT-Extended";
-  version = "3.17.0";
+  version = "3.23.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "97c66f197b4b175173bf955b9a845d03d62e521e512e88f6abff707e6859e7c3";
+    sha256 = "05nf94dp80i68gs61pf67qj1y6i56jgdxmibqmns5wz6z33fi7wj";
   };
 
-  propagatedBuildInputs = [ flask pyjwt werkzeug ];
+  propagatedBuildInputs = [ dateutil flask pyjwt werkzeug ];
   checkInputs = [ pytest ];
 
   checkPhase = ''
diff --git a/nixpkgs/pkgs/development/python-modules/flask-oauthlib/default.nix b/nixpkgs/pkgs/development/python-modules/flask-oauthlib/default.nix
deleted file mode 100644
index 587057514156..000000000000
--- a/nixpkgs/pkgs/development/python-modules/flask-oauthlib/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub
-, flask, oauthlib, requests_oauthlib, flask_sqlalchemy
-, mock, nose}:
-buildPythonPackage rec {
-  pname = "Flask-OAuthlib";
-  version = "0.9.5";
-
-  src = fetchFromGitHub {
-    owner = "lepture";
-    repo = "flask-oauthlib";
-    rev = "v${version}";
-    sha256 = "1l82niwrpm7411xvwh65bj263si90kcbrbfg5fa52mpixhxcp40f";
-  };
-
-  buildInputs = [ mock nose ];
-  propagatedBuildInputs = [
-    flask flask_sqlalchemy oauthlib requests_oauthlib
-  ];
-
-  checkPhase = "nosetests -d";
-  doCheck = false; # request mocking fails
-
-  meta = with stdenv.lib; {
-    description = "OAuthlib implementation for Flask";
-    license = licenses.mit;
-    maintainers = [ maintainers.mic92 ];
-    homepage = https://github.com/lepture/flask-oauthlib;
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/flask-sqlalchemy/default.nix b/nixpkgs/pkgs/development/python-modules/flask-sqlalchemy/default.nix
index aa7b40675b89..2ff84f2531b0 100644
--- a/nixpkgs/pkgs/development/python-modules/flask-sqlalchemy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-sqlalchemy/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, buildPythonPackage, fetchPypi, flask, sqlalchemy, pytest }:
+{ stdenv, buildPythonPackage, fetchPypi, flask, mock, sqlalchemy, pytest }:
 
 buildPythonPackage rec {
   pname = "Flask-SQLAlchemy";
-  version = "2.3.2";
+  version = "2.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0lvfynbk9y0whpkhqz7kf3hk342sfa3lwqyv25gnb22q5f2vjwar";
+    sha256 = "0nnllf0ddbh9jlhngnyjj98lbxgxr1csaplllx0caw98syq0k5hc";
   };
 
   propagatedBuildInputs = [ flask sqlalchemy ];
-  checkInputs = [ pytest ];
+  checkInputs = [ mock pytest ];
 
   checkPhase = ''
     pytest
diff --git a/nixpkgs/pkgs/development/python-modules/h11/default.nix b/nixpkgs/pkgs/development/python-modules/h11/default.nix
index f77c267d792c..361ac0c59d13 100644
--- a/nixpkgs/pkgs/development/python-modules/h11/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/h11/default.nix
@@ -23,6 +23,9 @@ buildPythonPackage rec {
     py.test
   '';
 
+  # Some of the tests use localhost networking.
+  __darwinAllowLocalNetworking = true;
+
   meta = with lib; {
     description = "Pure-Python, bring-your-own-I/O implementation of HTTP/1.1";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/impacket/default.nix b/nixpkgs/pkgs/development/python-modules/impacket/default.nix
new file mode 100644
index 000000000000..e4e14cf7bbf8
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/impacket/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchPypi, isPy3k }:
+
+buildPythonPackage rec {
+  pname = "impacket";
+  version = "0.9.15";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1sq1698g7wqj731h24f7gr4lc0fz0mxrqv6mm3j4hm2j6h3rrbr6";
+  };
+
+  disabled = isPy3k;
+
+  # no tests
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Network protocols Constructors and Dissectors";
+    homepage = "https://github.com/CoreSecurity/impacket";
+    # Modified Apache Software License, Version 1.1
+    license = licenses.free;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix b/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix
index 5203047b77fb..4bdd9011d1e8 100644
--- a/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix
@@ -37,6 +37,9 @@ buildPythonPackage rec {
     HOME=$(mktemp -d) pytest ipykernel -k "not (test_sys_path or test_sys_path_profile_dir or test_complete)"
   '';
 
+  # Some of the tests use localhost networking.
+  __darwinAllowLocalNetworking = true;
+
   meta = {
     description = "IPython Kernel for Jupyter";
     homepage = http://ipython.org/;
diff --git a/nixpkgs/pkgs/development/python-modules/keyring/default.nix b/nixpkgs/pkgs/development/python-modules/keyring/default.nix
index e54283735a86..cf1eeb5392c6 100644
--- a/nixpkgs/pkgs/development/python-modules/keyring/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/keyring/default.nix
@@ -1,27 +1,24 @@
 { stdenv, buildPythonPackage, fetchPypi
-, setuptools_scm, entrypoints, secretstorage
+, dbus-python, setuptools_scm, entrypoints, secretstorage
 , pytest, pytest-flake8 }:
 
 buildPythonPackage rec {
   pname = "keyring";
-  version = "18.0.1";
+  version = "19.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "67d6cc0132bd77922725fae9f18366bb314fd8f95ff4d323a4df41890a96a838";
+    sha256 = "13frfmws03jdyz9wxb4ylkvk80qiyb6a3h3sn7wx3ry97bn5li3a";
   };
 
   nativeBuildInputs = [ setuptools_scm ];
 
   checkInputs = [ pytest pytest-flake8 ];
 
-  propagatedBuildInputs = [ entrypoints ] ++ stdenv.lib.optional stdenv.isLinux secretstorage;
+  propagatedBuildInputs = [ dbus-python entrypoints ] ++ stdenv.lib.optional stdenv.isLinux secretstorage;
 
-  doCheck = !stdenv.isDarwin;
-
-  checkPhase = ''
-    py.test
-  '';
+  # checks try to access a darwin path on linux
+  doCheck = false;
 
   meta = with stdenv.lib; {
     description = "Store and access your passwords safely";
diff --git a/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix b/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix
index 3f9f58b5203f..3e2c1f1356ac 100644
--- a/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix
@@ -1,18 +1,19 @@
 { stdenv, fetchPypi, buildPythonPackage, hidapi
 , pycrypto, pillow, protobuf, future, ecpy, python-u2flib-host, pycryptodomex
+, websocket_client
 }:
 
 buildPythonPackage rec {
   pname = "ledgerblue";
-  version = "0.1.24";
+  version = "0.1.28";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "fc111ed5db8da93f280928d966f9d87416b464f5f09cec80b60e88c4c1265026";
+    sha256 = "1jfh4gb3f16ga1ircwiyg7dldldmhn0a5slbpqsqr2g6mlqihpmd";
   };
 
   propagatedBuildInputs = [
-    hidapi pycrypto pillow protobuf future ecpy python-u2flib-host pycryptodomex
+    hidapi pycrypto pillow protobuf future ecpy python-u2flib-host pycryptodomex websocket_client
   ];
 
   # No tests
diff --git a/nixpkgs/pkgs/development/python-modules/license-expression/default.nix b/nixpkgs/pkgs/development/python-modules/license-expression/default.nix
index 6d52e5f5c1f5..2bf204a9a628 100644
--- a/nixpkgs/pkgs/development/python-modules/license-expression/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/license-expression/default.nix
@@ -12,6 +12,7 @@ buildPythonPackage rec {
     rev = "v${version}";
     sha256 = "0q8sha38w7ajg7ar0rmbqrwv0n58l8yzyl96cqwcbvp578fn3ir0";
   };
+  postPatch = "patchShebangs ./configure";
 
   propagatedBuildInputs = [ boolean-py ];
 
diff --git a/nixpkgs/pkgs/development/python-modules/lxml/default.nix b/nixpkgs/pkgs/development/python-modules/lxml/default.nix
index 816b3a676828..fca4366e8a0e 100644
--- a/nixpkgs/pkgs/development/python-modules/lxml/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/lxml/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   };
 
   nativeBuildInputs = [ libxml2.dev libxslt.dev ];
-  buildInputs = [ libxml2 libxslt ];
+  propagatedBuildInputs = [ libxml2 libxslt ];
 
   hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format";
 
diff --git a/nixpkgs/pkgs/development/python-modules/mypy/default.nix b/nixpkgs/pkgs/development/python-modules/mypy/default.nix
index c5ca8e1f4b57..d4361baf903a 100644
--- a/nixpkgs/pkgs/development/python-modules/mypy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mypy/default.nix
@@ -3,14 +3,14 @@
 
 buildPythonPackage rec {
   pname = "mypy";
-  version = "0.701";
+  version = "0.711";
 
   # Tests not included in pip package.
   doCheck = false;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "05479r3gbq17r22hyhxjg49smx5q864pgx8ayy23rsdj4w6z2r2p";
+    sha256 = "0s1kwi1dhrv55v0c9w7c1g6mq5d2dpw7x1jj5mcnniw77mclmvdv";
   };
 
   disabled = !isPy3k;
diff --git a/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix b/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix
index 69828b2b18ff..2f0090b5967d 100644
--- a/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix
@@ -44,6 +44,9 @@ buildPythonPackage rec {
     HOME=$(mktemp -d) py.test -v --ignore="nbconvert/preprocessors/tests/test_execute.py"
   '';
 
+  # Some of the tests use localhost networking.
+  __darwinAllowLocalNetworking = true;
+
   meta = {
     description = "Converting Jupyter Notebooks";
     homepage = https://jupyter.org/;
diff --git a/nixpkgs/pkgs/development/python-modules/nbformat/default.nix b/nixpkgs/pkgs/development/python-modules/nbformat/default.nix
index 8b16ffb7e32b..fbc71202d286 100644
--- a/nixpkgs/pkgs/development/python-modules/nbformat/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nbformat/default.nix
@@ -29,6 +29,9 @@ buildPythonPackage rec {
     export HOME=tmp
   '';
 
+  # Some of the tests use localhost networking.
+  __darwinAllowLocalNetworking = true;
+
   meta = {
     description = "The Jupyter Notebook format";
     homepage = https://jupyter.org/;
diff --git a/nixpkgs/pkgs/development/python-modules/nbval/default.nix b/nixpkgs/pkgs/development/python-modules/nbval/default.nix
index 60aa4806e2fc..860142f1e94c 100644
--- a/nixpkgs/pkgs/development/python-modules/nbval/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nbval/default.nix
@@ -45,6 +45,9 @@ buildPythonPackage rec {
     pytest tests --ignore tests/test_timeouts.py
   '';
 
+  # Some of the tests use localhost networking.
+  __darwinAllowLocalNetworking = true;
+
   meta = with lib; {
     description = "A py.test plugin to validate Jupyter notebooks";
     homepage = https://github.com/computationalmodelling/nbval;
diff --git a/nixpkgs/pkgs/development/python-modules/ncclient/default.nix b/nixpkgs/pkgs/development/python-modules/ncclient/default.nix
index 10baadcab302..02e2a1b472a7 100644
--- a/nixpkgs/pkgs/development/python-modules/ncclient/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ncclient/default.nix
@@ -4,8 +4,6 @@
 , paramiko
 , selectors2
 , lxml
-, libxml2
-, libxslt
 , nose
 , rednose
 }:
@@ -22,7 +20,7 @@ buildPythonPackage rec {
   checkInputs = [ nose rednose ];
 
   propagatedBuildInputs = [
-    paramiko lxml libxml2 libxslt selectors2
+    paramiko lxml selectors2
   ];
 
   checkPhase = ''
diff --git a/nixpkgs/pkgs/development/python-modules/notebook/default.nix b/nixpkgs/pkgs/development/python-modules/notebook/default.nix
index 431d4bb4d563..d081a5a92fbe 100644
--- a/nixpkgs/pkgs/development/python-modules/notebook/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/notebook/default.nix
@@ -64,6 +64,9 @@ buildPythonPackage rec {
     else ""}
   '';
 
+  # Some of the tests use localhost networking.
+  __darwinAllowLocalNetworking = true;
+
   meta = {
     description = "The Jupyter HTML notebook is a web-based notebook environment for interactive computing";
     homepage = https://jupyter.org/;
diff --git a/nixpkgs/pkgs/development/python-modules/pdf2image/default.nix b/nixpkgs/pkgs/development/python-modules/pdf2image/default.nix
index 6d0cafd5f803..1fbddca8cc4f 100644
--- a/nixpkgs/pkgs/development/python-modules/pdf2image/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pdf2image/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "pdf2image";
-  version = "1.4.2";
+  version = "1.9.0";
 
   propagatedBuildInputs = [ pillow poppler_utils ];
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "694f8014f4c3722e5913f1c378c7056b1330db070ff7cb8196a80d24b80fa61e";
+    sha256 = "186g36dcfv83iranyd8gqw2zinhpcvmq86zd7sbsn237gcqk43rn";
   };
 
   meta = with stdenv.lib; {
diff --git a/nixpkgs/pkgs/development/python-modules/picos/default.nix b/nixpkgs/pkgs/development/python-modules/picos/default.nix
new file mode 100644
index 000000000000..57fbe099071d
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/picos/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitLab
+, numpy
+, cvxopt
+, python
+}:
+
+buildPythonPackage rec {
+  pname = "picos";
+  version = "1.2.0";
+
+  src = fetchFromGitLab {
+    owner = "picos-api";
+    repo = "picos";
+    rev = "v${version}";
+    sha256 = "018xhc7cb2crkk27lhl63c7h77w5wa37fg41i7nqr4xclr43cs9z";
+  };
+
+  propagatedBuildInputs = [
+    numpy
+    cvxopt
+  ];
+
+  checkPhase = ''
+    ${python.interpreter} test.py
+  '';
+  
+  meta = with lib; {
+    description = "A Python interface to conic optimization solvers";
+    homepage = https://gitlab.com/picos-api/picos;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ tobiasBora ];
+  };
+}
+
diff --git a/nixpkgs/pkgs/development/python-modules/portend/default.nix b/nixpkgs/pkgs/development/python-modules/portend/default.nix
index 5da7a7941c0f..7aa66c2a3093 100644
--- a/nixpkgs/pkgs/development/python-modules/portend/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/portend/default.nix
@@ -24,6 +24,9 @@ buildPythonPackage rec {
     py.test --deselect=test_portend.py::TestChecker::test_check_port_listening
   '';
 
+  # Some of the tests use localhost networking.
+  __darwinAllowLocalNetworking = true;
+
   meta = with stdenv.lib; {
     description = "Monitor TCP ports for bound or unbound states";
     homepage = https://github.com/jaraco/portend;
diff --git a/nixpkgs/pkgs/development/python-modules/pycurl2/default.nix b/nixpkgs/pkgs/development/python-modules/pycurl2/default.nix
index 01428d41b7d2..478f4451cf7a 100644
--- a/nixpkgs/pkgs/development/python-modules/pycurl2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pycurl2/default.nix
@@ -1,6 +1,4 @@
-{ stdenv
-, buildPythonPackage
-, fetchgit
+{ lib, buildPythonPackage, fetchFromGitHub
 , isPy3k
 , simplejson
 , unittest2
@@ -13,8 +11,9 @@ buildPythonPackage {
   version = "7.20.0";
   disabled = isPy3k;
 
-  src = fetchgit {
-    url = "https://github.com/Lispython/pycurl.git";
+  src = fetchFromGitHub {
+    owner = "Lispython";
+    repo = "pycurl";
     rev = "0f00109950b883d680bd85dc6e8a9c731a7d0d13";
     sha256 = "1qmw3cm93kxj94s71a8db9lwv2cxmr2wjv7kp1r8zildwdzhaw7j";
   };
@@ -22,9 +21,10 @@ buildPythonPackage {
   # error: (6, "Couldn't resolve host 'h.wrttn.me'")
   doCheck = false;
 
-  buildInputs = [ pkgs.curl simplejson unittest2 nose ];
+  nativeBuildInputs = [ pkgs.curl.dev ];
+  buildInputs = [ simplejson unittest2 nose ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = https://pypi.python.org/pypi/pycurl2;
     description = "A fork from original PycURL library that no maintained from 7.19.0";
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/development/python-modules/pytest-check/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-check/default.nix
new file mode 100644
index 000000000000..f91b8191eb15
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/pytest-check/default.nix
@@ -0,0 +1,29 @@
+{ stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, pytest
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "pytest-check";
+  version = "0.3.5";
+
+  src = fetchFromGitHub {
+    owner = "okken";
+    repo = "pytest-check";
+    rev = version;
+    sha256 = "11wb4f4sp4cr5mzqdakrbycwgfr2p1sx1l91fa6525wnfvgc0qy3";
+  };
+
+  buildInputs = [ pytest ];
+
+  checkInputs = [ pytest pytestCheckHook ];
+
+  meta = with stdenv.lib; {
+    description = "pytest plugin allowing multiple failures per test";
+    homepage = https://github.com/okken/pytest-check;
+    license = licenses.mit;
+    maintainers = [ maintainers.flokli ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix b/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix
index 93dd9fb654f9..bf6d4cd23817 100644
--- a/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix
@@ -1,27 +1,25 @@
-{ stdenv
-, buildPythonPackage
-, fetchFromGitHub
-, six
+{ stdenv, buildPythonPackage, fetchFromGitHub
+, aiohttp
 , eventlet
-, mock
 , iana-etc
 , libredirect
-, aiohttp
-, websockets
-, websocket_client
+, mock
 , requests
+, six
 , tornado
+, websocket_client
+, websockets
 }:
 
 buildPythonPackage rec {
   pname = "python-engineio";
-  version = "3.4.3";
+  version = "3.9.3";
 
   src = fetchFromGitHub {
     owner = "miguelgrinberg";
     repo = "python-engineio";
     rev = "v${version}";
-    sha256 = "0wk81rqigw47z087f5kc7b9iwqggypxc62q8q818qyzqwb93ysxf";
+    sha256 = "0rwlj12d37dpw6y3bdn6rxv68xnd9ykj4fr3ly0fa143xci35d9y";
   };
 
   propagatedBuildInputs = [
@@ -29,13 +27,13 @@ buildPythonPackage rec {
   ];
 
   checkInputs = [
+    aiohttp
     eventlet
     mock
-    aiohttp
-    websockets
-    websocket_client
-    tornado
     requests
+    tornado
+    websocket_client
+    websockets
   ];
 
   # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox
diff --git a/nixpkgs/pkgs/development/python-modules/python-language-server/default.nix b/nixpkgs/pkgs/development/python-modules/python-language-server/default.nix
index 6b25ba93ef9b..76508d1ec96f 100644
--- a/nixpkgs/pkgs/development/python-modules/python-language-server/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-language-server/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27
 , backports_functools_lru_cache, configparser, futures, future, jedi, pluggy, python-jsonrpc-server
-, pytest, mock, pytestcov, coverage
+, pytest, mock, pytestcov, coverage, setuptools
 , # Allow building a limited set of providers, e.g. ["pycodestyle"].
   providers ? ["*"]
   # The following packages are optional and
@@ -44,7 +44,7 @@ buildPythonPackage rec {
     HOME=$TEMPDIR pytest
   '';
 
-  propagatedBuildInputs = [ jedi pluggy future python-jsonrpc-server ]
+  propagatedBuildInputs = [ setuptools jedi pluggy future python-jsonrpc-server ]
     ++ stdenv.lib.optional (withProvider "autopep8") autopep8
     ++ stdenv.lib.optional (withProvider "mccabe") mccabe
     ++ stdenv.lib.optional (withProvider "pycodestyle") pycodestyle
diff --git a/nixpkgs/pkgs/development/python-modules/pyzmq/default.nix b/nixpkgs/pkgs/development/python-modules/pyzmq/default.nix
index dcab96d12a6a..40273cce8887 100644
--- a/nixpkgs/pkgs/development/python-modules/pyzmq/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pyzmq/default.nix
@@ -32,4 +32,7 @@ buildPythonPackage rec {
       and not test_on_recv_wake \
       and not test_monitor"
   '';
+
+  # Some of the tests use localhost networking.
+  __darwinAllowLocalNetworking = true;
 }
diff --git a/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix b/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix
index 503b899ec22d..c3cc1baaf43f 100644
--- a/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, urllib3, certifi }:
+{ stdenv, buildPythonPackage, fetchPypi, urllib3, certifi, django, flask, tornado, sanic, aiohttp, bottle, rq, falcon, pyramid, celery }:
 
 buildPythonPackage rec {
   pname = "sentry-sdk";
@@ -9,6 +9,8 @@ buildPythonPackage rec {
     sha256 = "f5819df450d7b0696be69a0c6d70a09e4890a3844ee8ccb7a461794135bd5965";
   };
 
+  checkInputs = [ django flask tornado sanic aiohttp bottle rq falcon pyramid celery ];
+
   propagatedBuildInputs = [ urllib3 certifi ];
 
   meta = with stdenv.lib; {
diff --git a/nixpkgs/pkgs/development/python-modules/trustme/default.nix b/nixpkgs/pkgs/development/python-modules/trustme/default.nix
index e2ba008d3a0b..601e49759fd0 100644
--- a/nixpkgs/pkgs/development/python-modules/trustme/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/trustme/default.nix
@@ -36,6 +36,9 @@ buildPythonPackage rec {
     pytest
   '';
 
+  # Some of the tests use localhost networking.
+  __darwinAllowLocalNetworking = true;
+
   meta = {
     description = "High quality TLS certs while you wait, for the discerning tester";
     homepage = https://github.com/python-trio/trustme;
diff --git a/nixpkgs/pkgs/development/python-modules/typed-ast/default.nix b/nixpkgs/pkgs/development/python-modules/typed-ast/default.nix
index f540cf72877a..0514be0fb4d4 100644
--- a/nixpkgs/pkgs/development/python-modules/typed-ast/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/typed-ast/default.nix
@@ -1,10 +1,12 @@
-{ buildPythonPackage, fetchPypi, lib, pythonOlder }:
+{ buildPythonPackage, fetchFromGitHub, lib, pythonOlder }:
 buildPythonPackage rec {
   pname = "typed-ast";
-  version = "1.3.5";
-  src = fetchPypi{
-    inherit pname version;
-    sha256 = "1m7pr6qpana3cvqwiw7mlvrgvmw27ch5mx1592572xhlki8g85ak";
+  version = "1.4.0";
+  src = fetchFromGitHub{
+    owner = "python";
+    repo = "typed_ast";
+    rev = version;
+    sha256 = "0l0hz809f7i356kmqkvfsaswiidb98j9hs9rrjnfawzqcbffzgyb";
   };
   # Only works with Python 3.3 and newer;
   disabled = pythonOlder "3.3";
diff --git a/nixpkgs/pkgs/development/python-modules/uvicorn/default.nix b/nixpkgs/pkgs/development/python-modules/uvicorn/default.nix
index 1bf0d1c54f06..9f7efef1e843 100644
--- a/nixpkgs/pkgs/development/python-modules/uvicorn/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/uvicorn/default.nix
@@ -1,23 +1,27 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , click
 , h11
 , httptools
 , uvloop
 , websockets
 , wsproto
+, pytest
+, requests
 , isPy27
 }:
 
 buildPythonPackage rec {
   pname = "uvicorn";
-  version = "0.8.4";
+  version = "0.9.0";
   disabled = isPy27;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1l8rfm30inx9pma893i7sby9h7y910k58841zqaajksn563b882k";
+  src = fetchFromGitHub {
+    owner = "encode";
+    repo = pname;
+    rev = version;
+    sha256 = "0z4h04mbkzqgpk698bac6f50jxkf02ils6khzl7zbw7yvi6gkkc8";
   };
 
   propagatedBuildInputs = [
@@ -29,11 +33,15 @@ buildPythonPackage rec {
     wsproto
   ];
 
-  checkPhase = ''
-    $out/bin/uvicorn --help
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "h11==0.8.*" "h11"
   '';
 
-  patches = [ ./setup.patch ];
+  checkInputs = [ pytest requests ];
+  checkPhase = ''
+    pytest
+  '';
 
   meta = with lib; {
     homepage = https://www.uvicorn.org/;
diff --git a/nixpkgs/pkgs/development/python-modules/uvicorn/setup.patch b/nixpkgs/pkgs/development/python-modules/uvicorn/setup.patch
deleted file mode 100644
index f1d974b42d93..000000000000
--- a/nixpkgs/pkgs/development/python-modules/uvicorn/setup.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 802cda4..561abf4 100755
---- a/setup.py
-+++ b/setup.py
-@@ -42,7 +42,7 @@ env_marker = (
- 
- requirements = [
-     "click==7.*",
--    "h11==0.8.*",
-+    "h11",
-     "websockets==7.*",
-     "httptools==0.0.13 ;" + env_marker,
-     "uvloop==0.12.* ;" + env_marker,
diff --git a/nixpkgs/pkgs/development/python-modules/uvloop/darwin_sandbox.patch b/nixpkgs/pkgs/development/python-modules/uvloop/darwin_sandbox.patch
new file mode 100644
index 000000000000..bd4e5e48b149
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/uvloop/darwin_sandbox.patch
@@ -0,0 +1,28 @@
+diff --git a/tests/test_pipes.py b/tests/test_pipes.py
+index d883abf..2e74d7a 100644
+--- a/tests/test_pipes.py
++++ b/tests/test_pipes.py
+@@ -2,6 +2,7 @@ import asyncio
+ import io
+ import os
+ import socket
++import unittest
+ 
+ from uvloop import _testbase as tb
+ 
+@@ -96,6 +97,7 @@ class _BasePipeTest:
+         # extra info is available
+         self.assertIsNotNone(proto.transport.get_extra_info('pipe'))
+ 
++    @unittest.skip("darwin sandbox")
+     def test_read_pty_output(self):
+         proto = MyReadPipeProto(loop=self.loop)
+ 
+@@ -198,6 +200,7 @@ class _BasePipeTest:
+         self.loop.run_until_complete(proto.done)
+         self.assertEqual('CLOSED', proto.state)
+ 
++    @unittest.skip("darwin sandbox")
+     def test_write_pty(self):
+         master, slave = os.openpty()
+         os.set_blocking(master, False)
diff --git a/nixpkgs/pkgs/development/python-modules/uvloop/default.nix b/nixpkgs/pkgs/development/python-modules/uvloop/default.nix
index 2093f4d7053c..171f6d6ed32f 100644
--- a/nixpkgs/pkgs/development/python-modules/uvloop/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/uvloop/default.nix
@@ -20,6 +20,8 @@ buildPythonPackage rec {
     sha256 = "0blcnrd5vky2k1m1p1skx4516dr1jx76yyb0c6fi82si6mqd0b4l";
   };
 
+  patches = lib.optional stdenv.isDarwin ./darwin_sandbox.patch;
+
   buildInputs = [
     libuv
   ] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ];
@@ -31,6 +33,9 @@ buildPythonPackage rec {
 
   checkInputs = [ pyopenssl psutil ];
 
+  # Some of the tests use localhost networking.
+  __darwinAllowLocalNetworking = true;
+
   meta = with lib; {
     description = "Fast implementation of asyncio event loop on top of libuv";
     homepage = http://github.com/MagicStack/uvloop;
diff --git a/nixpkgs/pkgs/development/python-modules/websockets/default.nix b/nixpkgs/pkgs/development/python-modules/websockets/default.nix
index 2e0caae4b469..589a8089fcaa 100644
--- a/nixpkgs/pkgs/development/python-modules/websockets/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/websockets/default.nix
@@ -1,24 +1,26 @@
 { lib
-, fetchPypi
+, fetchFromGitHub
 , buildPythonPackage
 , pythonOlder
+, pytest
 }:
 
 buildPythonPackage rec {
   pname = "websockets";
-  version = "7.0";
+  version = "8.0.2";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "17vwr6sa1y3lb24wzfyyc98c5v03di4j8f24qkqa9vsvaghc7qq8";
+  src = fetchFromGitHub {
+    owner = "aaugustin";
+    repo = pname;
+    rev = version;
+    sha256 = "02fgb8gib4z5fqv30brz3mhxmblw9bw0978fhpjdrkj7wvqrz5h8";
   };
 
   disabled = pythonOlder "3.3";
-  doCheck = false; # protocol tests fail
 
-  meta = {
+  meta = with lib; {
     description = "WebSocket implementation in Python 3";
-    homepage = https://github.com/aaugustin/websockets;
-    license = lib.licenses.bsd3;
+    homepage = "https://github.com/aaugustin/websockets";
+    license = licenses.bsd3;
   };
 }
diff --git a/nixpkgs/pkgs/development/r-modules/default.nix b/nixpkgs/pkgs/development/r-modules/default.nix
index 1616eacffc65..a9bb3487813e 100644
--- a/nixpkgs/pkgs/development/r-modules/default.nix
+++ b/nixpkgs/pkgs/development/r-modules/default.nix
@@ -441,13 +441,17 @@ let
     nlme = [ pkgs.libiconv ];
     Matrix = [ pkgs.libiconv ];
     mgcv = [ pkgs.libiconv ];
+    minqa = [ pkgs.libiconv ];
     igraph = [ pkgs.libiconv ];
     ape = [ pkgs.libiconv ];
     expm = [ pkgs.libiconv ];
     mnormt = [ pkgs.libiconv ];
+    pan = [ pkgs.libiconv ];
     phangorn = [ pkgs.libiconv ];
     quadprog = [ pkgs.libiconv ];
+    randomForest = [ pkgs.libiconv ];
     sundialr = [ pkgs.libiconv ];
+    ucminf = [ pkgs.libiconv ];
   };
 
   packagesRequireingX = [
diff --git a/nixpkgs/pkgs/development/tools/ammonite/default.nix b/nixpkgs/pkgs/development/tools/ammonite/default.nix
index ff630242c933..d44a6666ee9f 100644
--- a/nixpkgs/pkgs/development/tools/ammonite/default.nix
+++ b/nixpkgs/pkgs/development/tools/ammonite/default.nix
@@ -1,30 +1,27 @@
-{ stdenv, lib, fetchurl, makeWrapper, jre, gnused
+{ stdenv, fetchurl, jre
 , disableRemoteLogging ? true
 }:
 
 with stdenv.lib;
+
+let
+common = { scalaVersion, sha256 }:
 stdenv.mkDerivation rec {
   pname = "ammonite";
   version = "1.7.1";
-  scalaVersion = "2.12";
 
   src = fetchurl {
     url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}";
-    sha256 = "0isg9flnzc2ldbx6q0lg0xyg9lnvqkd8qhgfln8p1hbzdq0n6jd0";
+    inherit sha256;
   };
 
-  propagatedBuildInputs = [ jre ] ;
-  buildInputs = [ makeWrapper gnused ] ;
-
   phases = "installPhase";
 
   installPhase = ''
-    mkdir -p $out/bin
-    cp ${src} $out/bin/amm
-    chmod +x $out/bin/amm
-    ${gnused}/bin/sed -i '0,/java/{s|java|${jre}/bin/java|}' $out/bin/amm
+    install -Dm755 ${src} $out/bin/amm
+    sed -i '0,/java/{s|java|${jre}/bin/java|}' $out/bin/amm
   '' + optionalString (disableRemoteLogging) ''
-    ${gnused}/bin/sed -i '0,/ammonite.Main/{s|ammonite.Main|ammonite.Main --no-remote-logging|}' $out/bin/amm
+    sed -i '0,/ammonite.Main/{s|ammonite.Main|ammonite.Main --no-remote-logging|}' $out/bin/amm
   '';
 
   meta = {
@@ -36,8 +33,12 @@ stdenv.mkDerivation rec {
         that may be familiar to people coming from IDEs or other REPLs such as IPython or Zsh.
     '';
     homepage = http://www.lihaoyi.com/Ammonite/;
-    license = lib.licenses.mit;
-    platforms = lib.platforms.all;
-    maintainers = [ lib.maintainers.nequissimus ];
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = [ maintainers.nequissimus ];
   };
+};
+in {
+  ammonite_2_12 = common { scalaVersion = "2.12"; sha256 = "0isg9flnzc2ldbx6q0lg0xyg9lnvqkd8qhgfln8p1hbzdq0n6jd0"; };
+  ammonite_2_13 = common { scalaVersion = "2.13"; sha256 = "01dyc6bilhcr1mwrpmhjc8nhzfqgjh44bx36gd3gk9mkvlbys5mp"; };
 }
diff --git a/nixpkgs/pkgs/development/tools/analysis/bingrep/default.nix b/nixpkgs/pkgs/development/tools/analysis/bingrep/default.nix
new file mode 100644
index 000000000000..5fd6b402e0b0
--- /dev/null
+++ b/nixpkgs/pkgs/development/tools/analysis/bingrep/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, rustPlatform, fetchFromGitHub }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "bingrep";
+  version = "0.7.0";
+
+  src = fetchFromGitHub {
+    owner = "m4b";
+    repo = pname;
+    # Currently doesn't tag versions so we're using the raw revision
+    rev = "33d56a4b020c4a3c111294fe41c613d5e8e9c7af";
+    sha256 = "0lg92wqknr584b44i5v4f97js56j89z7n8p2zpm8j1pfhjmgcigs";
+  };
+
+  cargoSha256 = "1yxm7waldhilx7wh1ag79rkp8kypb9k1px4ynmzq11r72yl2p4m7";
+
+  meta = with stdenv.lib; {
+    description = "Greps through binaries from various OSs and architectures, and colors them";
+    homepage = "https://github.com/m4b/bingrep";
+    license = licenses.mit;
+    maintainers = with maintainers; [ minijackson ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix
index f4c7047e8de2..2d7d99bb3937 100644
--- a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "flow";
-  version = "0.107.0";
+  version = "0.108.0";
 
   src = fetchFromGitHub {
     owner  = "facebook";
     repo   = "flow";
     rev    = "refs/tags/v${version}";
-    sha256 = "1in7a006lgw4v2p0gn5sx41cn3p259vncpq0l3rz52lyfpn7ai3b";
+    sha256 = "13irr1hkv7mxvq57pywmjmqdf5fv359vl5d19w3sra3rqg7vi3ws";
   };
 
   installPhase = ''
diff --git a/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix b/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix
index 8c47a8bc0697..39e9830dd5d1 100644
--- a/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "tflint";
-  version = "0.11.1";
+  version = "0.11.2";
 
   src = fetchFromGitHub {
     owner = "wata727";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0aw39xv6jpnhy201gp9jhz6cbz47k7qgxgcwsffak8janbk6bj2a";
+    sha256 = "1lhg81bsmzxs46329rlayf8k2y7fbjlmxj09rqbygr9f0693rzgy";
   };
 
-  modSha256 = "1facqppgpmmz2j7j77fa3mnjv2nzjxz4ya6xvyvyy92ma0ybclgh";
+  modSha256 = "10za02363yglhj0pbsd2591rflrrcq12gxx9d53pg9hb7lrxj9ij";
 
   subPackages = [ "." ];
 
diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
index b606e5470361..fc5f98a8ccb6 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
@@ -2,15 +2,15 @@
 
 buildGoPackage rec {
   pname = "bazel-buildtools";
-  version = "0.28.0";
-  rev = "d7ccc5507c6c16e04f5e362e558d70b8b179b052";
+  version = "0.29.0";
+  rev = "5bcc31df55ec1de770cb52887f2e989e7068301f";
 
   goPackagePath = "github.com/bazelbuild/buildtools";
 
   src = fetchgit {
     inherit rev;
     url = "https://github.com/bazelbuild/buildtools";
-    sha256 = "1d8zjgbg77sk27cz9pjz1h6ajwxqmvdzqgwa2jbh6iykibhpadq0";
+    sha256 = "0p2kgyawh3l46h7dzglqh9c7i16zr5mhmqlhy7qvr4skwif1l089";
   };
 
   goDeps = ./deps.nix;
diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix
index 5bae5b406535..4aaa37aa9a7b 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix
@@ -5,17 +5,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/golang/protobuf";
-      rev = "6c65a5562fc06764971b7c5d05c76c75e84bdbf7";
-      sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym";
+      rev = "4c88cc3f1a34ffade77b79abc53335d1e511f25b";
+      sha256 = "0chbdc4q55z7myiwnbvhryc5ihf6cxh8p4w3c1imy2gyzjn9sf4r";
     };
   }
   {
-    goPackagePath = "github.com/google/skylark";
+    goPackagePath = "go.starlark.net";
     fetch = {
       type = "git";
-      url = "https://github.com/google/skylark";
-      rev = "a5f7082aabed29c0e429c722292c66ec8ecf9591";
-      sha256 = "16vsa6ngsby27n6indj441r1glcdfgipjcwcb0rs6zl2dqlqr286";
+      url = "https://github.com/google/starlark-go";
+      rev = "988906f77f657477aa7ebf4d8fb5f12d6c50b767";
+      sha256 = "0ivmbcq3avaxj8ixbc60h706d6wk9wi2mnsid6a483ia4yn7w9k8";
     };
   }
 ]
diff --git a/nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/default.nix b/nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/default.nix
index d25367c3e572..f08a2e563429 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/redo-apenwarr/default.nix
@@ -17,10 +17,10 @@ in stdenv.mkDerivation rec {
   pname = "redo-apenwarr";
   version = "0.42";
 
-  src = fetchFromGitHub {
+  src = fetchFromGitHub rec {
     owner = "apenwarr";
-    repo = pname;
-    rev = "${pname}-${version}";
+    repo = "redo";
+    rev = "${repo}-${version}";
     sha256 = "1060yb7hrxm8c7bfvb0y4j0acpxsj6hbykw1d9549zpkxxr9nsgm";
   };
 
diff --git a/nixpkgs/pkgs/development/tools/cask/default.nix b/nixpkgs/pkgs/development/tools/cask/default.nix
index 8ec2552aeffb..710503560691 100644
--- a/nixpkgs/pkgs/development/tools/cask/default.nix
+++ b/nixpkgs/pkgs/development/tools/cask/default.nix
@@ -2,18 +2,19 @@
 
 stdenv.mkDerivation rec {
   pname = "cask";
-  version = "0.8.4";
 
-  src = fetchurl {
-    url = "https://github.com/cask/cask/archive/v${version}.tar.gz";
-    sha256 = "02f8bb20b33b23fb11e7d2a1d282519dfdb8b3090b9672448b8c2c2cacd3e478";
-  };
+  inherit (emacsPackages.melpaStablePackages.cask) src version;
 
   doCheck = true;
+
+  nativeBuildInputs = [ emacsPackages.emacs ];
   buildInputs = with emacsPackages; [
     s f dash ansi ecukes servant ert-runner el-mock
     noflet ert-async shell-split-string git package-build
+  ] ++ [
+    python
   ];
+
   buildPhase = ''
     emacs --batch -L . -f batch-byte-compile cask.el cask-cli.el
   '';
@@ -38,11 +39,9 @@ stdenv.mkDerivation rec {
       Cask can also be used to manage dependencies for your local Emacs configuration.
     '';
 
-    homepage = https://cask.readthedocs.io/en/latest/index.html;
+    homepage = "https://cask.readthedocs.io/en/latest/index.html";
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.flexw ];
   };
-
-  nativeBuildInputs = [ emacsPackages.emacs python ];
 }
diff --git a/nixpkgs/pkgs/development/tools/golangci-lint/default.nix b/nixpkgs/pkgs/development/tools/golangci-lint/default.nix
index 7a3d7882715f..b8026a9f8852 100644
--- a/nixpkgs/pkgs/development/tools/golangci-lint/default.nix
+++ b/nixpkgs/pkgs/development/tools/golangci-lint/default.nix
@@ -1,6 +1,6 @@
-{ buildGoModule, fetchFromGitHub, lib }:
+{ buildGoPackage, fetchFromGitHub, lib }:
 
-buildGoModule rec {
+buildGoPackage rec {
   pname = "golangci-lint";
   version = "1.17.1";
   goPackagePath = "github.com/golangci/golangci-lint";
@@ -14,8 +14,6 @@ buildGoModule rec {
     sha256 = "1hs24nimv11c63a90ds8ps1lli16m3apsbrd9vpbq2rmxdbpwqac";
   };
 
-  modSha256 = "0k0831rg6ygjffrq5y9488aiacskky7g6bvsfrgfz0g7i0mig1n6";
-
   meta = with lib; {
     description = "Linters Runner for Go. 5x faster than gometalinter. Nice colored output.";
     homepage = https://golangci.com/;
diff --git a/nixpkgs/pkgs/development/tools/misc/ctags/wrapped.nix b/nixpkgs/pkgs/development/tools/misc/ctags/wrapped.nix
index 869e7a61121d..08f8049aa8a1 100644
--- a/nixpkgs/pkgs/development/tools/misc/ctags/wrapped.nix
+++ b/nixpkgs/pkgs/development/tools/misc/ctags/wrapped.nix
@@ -27,10 +27,10 @@ with pkgs.stdenv.lib;
 
   # don't scan version control directories
   defaultArgs = [
-    "--exclude=\.svn"
-    "--exclude=\.hg"
-    "--exclude=\.git"
-    "--exclude=\_darcs"
+    "--exclude=.svn"
+    "--exclude=.hg"
+    "--exclude=.git"
+    "--exclude=_darcs"
     "--sort=yes"
   ];
 
@@ -38,8 +38,8 @@ with pkgs.stdenv.lib;
   asLang = [
     "--langdef=ActionScript"
     "--langmap=ActionScript:.as"
-    "--regex-ActionScript=/function[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\1/f,function,functions/"
-    "--regex-ActionScript=/function[ \\t]+(set|get)[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\2/p,property,properties/"
+    "--regex-ActionScript=/function[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\\1/f,function,functions/"
+    "--regex-ActionScript=/function[ \\t]+(set|get)[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\\2/p,property,properties/"
     "--regex-ActionScript=/interface[ \\t]+[a-z0-9_.]*([A-Z][A-Za-z0-9_]+)/\\1/i,interface,interfaces/"
     "--regex-ActionScript=/package[ \\t]+([^ \\t]*)/\\1/p/"
     "--regex-ActionScript=/class[ \\t]+[a-z0-9_.]*([A-Z][A-Za-z0-9_]+)/\\1/c,class,classes/"
@@ -67,7 +67,7 @@ with pkgs.stdenv.lib;
   nixLang = [
     "--langdef=NIX"
     "--langmap=NIX:.nix"
-    "--regex-NIX=/\([^ \\t*]*\)[ \\t]*=/\\1/f/"
+    "--regex-NIX=/([^ \\t*]*)[ \\t]*=/\\1/f/"
   ];
 
   rubyLang = [
diff --git a/nixpkgs/pkgs/development/tools/misc/elfinfo/default.nix b/nixpkgs/pkgs/development/tools/misc/elfinfo/default.nix
index cb127906c0bf..b1a51a771448 100644
--- a/nixpkgs/pkgs/development/tools/misc/elfinfo/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/elfinfo/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
-buildGoModule rec {
+buildGoPackage rec {
   pname = "elfinfo";
   version = "0.7.6";
 
@@ -12,8 +12,6 @@ buildGoModule rec {
     sha256 = "0f6ik4d157assxdfslnyc91mg70kfh396rapikfv473znx2v2pg9";
   };
 
-  modSha256 = "1xr0pylaqcb4f4g862120cgqdxp0bpwsk77zd6g7kk91lqdcvsdf";
-
   meta = with stdenv.lib; {
     description = "Small utility for showing information about ELF files";
     homepage = https://elfinfo.roboticoverlords.org/;
diff --git a/nixpkgs/pkgs/development/tools/misc/hydra-cli/default.nix b/nixpkgs/pkgs/development/tools/misc/hydra-cli/default.nix
new file mode 100644
index 000000000000..24ca98118bdc
--- /dev/null
+++ b/nixpkgs/pkgs/development/tools/misc/hydra-cli/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, lib, pkgconfig, openssl, fetchFromGitHub, rustPlatform, darwin }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "hydra-cli";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "nlewo";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1jdlmc45hwblcxs6hvy3gi2dr7qyzs1sg5zr26jrpxrbvqqzrdhc";
+  };
+
+  cargoSha256 = "0dqj2pdqfbgg8r3h2s07p3m9zgl9xl4vislbqs6a0f1ahrczlda5";
+
+  buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
+
+  nativeBuildInputs = [
+    pkgconfig
+    openssl
+  ];
+
+  meta = with stdenv.lib; {
+    description = "A client for the Hydra CI";
+    homepage = "https://github.com/nlewo/hydra-cli";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ gilligan lewo ];
+    platforms = platforms.all;
+  };
+
+}
diff --git a/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix b/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix
index 7a3ccaa9fbc4..b9b1f83322d1 100644
--- a/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix
@@ -1,6 +1,6 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
-buildGoModule rec {
+buildGoPackage rec {
   pname = "mkcert";
   version = "1.4.0";
 
@@ -11,7 +11,7 @@ buildGoModule rec {
     sha256 = "0xcmvzh5lq8vs3b0f1zw645fxdr8471v7prl1656q02v38f58ly7";
   };
 
-  modSha256 = "0an12l15a82mks6gipczdpcf2vklk14wjjnk0ccl3kdjwiw7f4wd";
+  goPackagePath = "github.com/FiloSottile/mkcert";
 
   meta = with lib; {
     homepage = https://github.com/FiloSottile/mkcert;
diff --git a/nixpkgs/pkgs/development/tools/misc/terraform-lsp/default.nix b/nixpkgs/pkgs/development/tools/misc/terraform-lsp/default.nix
index 333e413a4c49..94492395a589 100644
--- a/nixpkgs/pkgs/development/tools/misc/terraform-lsp/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/terraform-lsp/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "terraform-lsp";
-  version = "0.0.6";
+  version = "0.0.9";
 
   src = fetchFromGitHub {
     owner = "juliosueiras";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1nalypaw64kdv5zmmb0xgkajhs2gf71ivbxvgwpgvlv2lyidawx5";
+    sha256 = "1m133fznf58fkjl5yx0gxa3cjfb0h8f9fv760c9h1d5cg279bghk";
   };
 
   modSha256 = "1mb3169vdlv4h10k15pg88s48s2b6y7v5frk9j9ahg52grygcqb2";
diff --git a/nixpkgs/pkgs/development/tools/misc/ycmd/default.nix b/nixpkgs/pkgs/development/tools/misc/ycmd/default.nix
index 12f0b13a6602..eac81aa7f171 100644
--- a/nixpkgs/pkgs/development/tools/misc/ycmd/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/ycmd/default.nix
@@ -1,18 +1,19 @@
 { stdenv, lib, fetchgit, cmake, llvmPackages, boost, python
 , gocode ? null
 , godef ? null
+, gotools ? null
 , rustracerd ? null
 , fixDarwinDylibNames, Cocoa ? null
 }:
 
 stdenv.mkDerivation {
   pname = "ycmd";
-  version = "2018-09-20";
+  version = "2019-09-19";
 
   src = fetchgit {
     url = "https://github.com/Valloric/ycmd.git";
-    rev = "bf658fd78722c517674c0aaf2381e199bca8f163";
-    sha256 = "1lwa8xr76vapfpncvp81cn3m9219yw14fl7fzk5gnly60zkphbbl";
+    rev = "c6d360775b0c5c82e2513dce7b625f8bf3812702";
+    sha256 = "19rxlval20gg65xc5p7q9cnzfm9zw2j0m6vxxk0vqlalcyh0rnzd";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -49,18 +50,28 @@ stdenv.mkDerivation {
     mkdir -p $out/bin
     ln -s $out/lib/ycmd/ycmd/__main__.py $out/bin/ycmd
 
-    mkdir -p $out/lib/ycmd/third_party/{gocode,godef,racerd/target/release}
-
-    for p in jedi waitress frozendict bottle parso python-future requests; do
-      cp -r third_party/$p $out/lib/ycmd/third_party
-    done
+    # Copy everything: the structure of third_party has been known to change.
+    # When linking our own libraries below, do so with '-f'
+    # to clobber anything we may have copied here.
+    mkdir -p $out/lib/ycmd/third_party
+    cp -r third_party/* $out/lib/ycmd/third_party/
 
   '' + lib.optionalString (gocode != null) ''
-    ln -s ${gocode}/bin/gocode $out/lib/ycmd/third_party/gocode
+    TARGET=$out/lib/ycmd/third_party/gocode
+    mkdir -p $TARGET
+    ln -sf ${gocode}/bin/gocode $TARGET
   '' + lib.optionalString (godef != null) ''
-    ln -s ${godef}/bin/godef $out/lib/ycmd/third_party/godef
+    TARGET=$out/lib/ycmd/third_party/godef
+    mkdir -p $TARGET
+    ln -sf ${godef}/bin/godef $TARGET
+  '' + lib.optionalString (gotools != null) ''
+    TARGET=$out/lib/ycmd/third_party/go/src/golang.org/x/tools/cmd/gopls
+    mkdir -p $TARGET
+    ln -sf ${gotools}/bin/gopls $TARGET
   '' + lib.optionalString (rustracerd != null) ''
-    ln -s ${rustracerd}/bin/racerd $out/lib/ycmd/third_party/racerd/target/release
+    TARGET=$out/lib/ycmd/third_party/racerd/target/release
+    mkdir -p $TARGET
+    ln -sf ${rustracerd}/bin/racerd $TARGET
   '';
 
   # fixup the argv[0] and replace __file__ with the corresponding path so
diff --git a/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix b/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix
index 19432843218c..4dd216713251 100644
--- a/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation {
 
-  name = "camlp5-7.08";
+  name = "camlp5-7.10";
 
   src = fetchzip {
-    url = "https://github.com/camlp5/camlp5/archive/rel708.tar.gz";
-    sha256 = "0b39bvr1aa7kzjhbyycmvcrwil2yjbxc84cb43zfzahx4p2aqr76";
+    url = "https://github.com/camlp5/camlp5/archive/rel710.tar.gz";
+    sha256 = "1a1lgsc8350afdwmsznsys7m0c0cks4nw6irqz2f92g8g4vkk9b7";
   };
 
   buildInputs = [ ocaml ];
diff --git a/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix b/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix
index 694f4b6e89a0..4eb1cc858ad0 100644
--- a/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix
+++ b/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix
@@ -1,35 +1,33 @@
-{ stdenv, fetchFromGitHub, ocamlPackages }:
+{ lib, fetchFromGitHub, ocamlPackages }:
 
 with ocamlPackages; buildDunePackage rec {
   pname = "ocamlformat";
-  version = "0.8";
+  version = "0.11.0";
 
-  minimumOCamlVersion = "4.05";
+  minimumOCamlVersion = "4.06";
 
   src = fetchFromGitHub {
     owner = "ocaml-ppx";
     repo = pname;
     rev = version;
-    sha256 = "1i7rsbs00p43362yv7z7dw0qsnv7vjf630qk676qvfg7kg422w6j";
+    sha256 = "0zvjn71jd4d3znnpgh0yphb2w8ggs457b6bl6cg1fmpdgxnds6yx";
   };
 
   buildInputs = [
-    base
     cmdliner
     fpath
     ocaml-migrate-parsetree
+    odoc
+    re
     stdio
+    uuseg
+    uutf
   ];
 
-  configurePhase = ''
-    patchShebangs tools/gen_version.sh
-    tools/gen_version.sh src/Version.ml version
-  '';
-
   meta = {
     inherit (src.meta) homepage;
     description = "Auto-formatter for OCaml code";
-    maintainers = [ stdenv.lib.maintainers.Zimmi48 ];
-    license = stdenv.lib.licenses.mit;
+    maintainers = [ lib.maintainers.Zimmi48 ];
+    license = lib.licenses.mit;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/pgformatter/default.nix b/nixpkgs/pkgs/development/tools/pgformatter/default.nix
index 5d8376acdb39..dfdd453cb4e8 100644
--- a/nixpkgs/pkgs/development/tools/pgformatter/default.nix
+++ b/nixpkgs/pkgs/development/tools/pgformatter/default.nix
@@ -2,13 +2,13 @@
 
 perlPackages.buildPerlPackage rec {
   pname = "pgformatter";
-  version = "4.0";
+  version = "4.1";
 
   src = fetchFromGitHub {
     owner = "darold";
     repo = "pgFormatter";
     rev = "v${version}";
-    sha256 = "09p242s406mf469p66zp1jmp9pxcim2vk1v6qsxnrbzicchsn5i2";
+    sha256 = "1xp26p70zn7mh4qg4w74a690ww43b1csgl92ak9fg8kidgwcbprd";
   };
 
   outputs = [ "out" ];
diff --git a/nixpkgs/pkgs/development/tools/skopeo/default.nix b/nixpkgs/pkgs/development/tools/skopeo/default.nix
index e7b21c40f17b..e36f34bb10c4 100644
--- a/nixpkgs/pkgs/development/tools/skopeo/default.nix
+++ b/nixpkgs/pkgs/development/tools/skopeo/default.nix
@@ -5,13 +5,13 @@
 with stdenv.lib;
 
 let
-  version = "0.1.37";
+  version = "0.1.39";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "containers";
     repo = "skopeo";
-    sha256 = "1ly5yq3aj4ciqn6hbhvxqp1im81pbas9smdhbbks7iwjvh944d62";
+    sha256 = "1jkxmvh079pd9j4aa39ilmclwafnjs0yqdiigwh8cj7yf97x4vsi";
   };
 
   defaultPolicyFile = runCommand "skopeo-default-policy.json" {} "cp ${src}/default-policy.json $out";